← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to drivers/s390/crypto/zcrypt_pcica.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/s390/crypto/zcrypt_pcica.c
67
67
static struct ap_driver zcrypt_pcica_driver = {
68
68
        .probe = zcrypt_pcica_probe,
69
69
        .remove = zcrypt_pcica_remove,
70
 
        .receive = zcrypt_pcica_receive,
71
70
        .ids = zcrypt_pcica_ids,
72
71
        .request_timeout = PCICA_CLEANUP_TIME,
73
72
};
284
283
        ap_msg.message = kmalloc(PCICA_MAX_MESSAGE_SIZE, GFP_KERNEL);
285
284
        if (!ap_msg.message)
286
285
                return -ENOMEM;
 
286
        ap_msg.receive = zcrypt_pcica_receive;
287
287
        ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
288
288
                                atomic_inc_return(&zcrypt_step);
289
289
        ap_msg.private = &work;
322
322
        ap_msg.message = kmalloc(PCICA_MAX_MESSAGE_SIZE, GFP_KERNEL);
323
323
        if (!ap_msg.message)
324
324
                return -ENOMEM;
 
325
        ap_msg.receive = zcrypt_pcica_receive;
325
326
        ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
326
327
                                atomic_inc_return(&zcrypt_step);
327
328
        ap_msg.private = &work;