diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/s390/crypto/zcrypt_pcica.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/s390/crypto/zcrypt_pcica.c')
| -rw-r--r-- | drivers/s390/crypto/zcrypt_pcica.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/crypto/zcrypt_pcica.c b/drivers/s390/crypto/zcrypt_pcica.c index 09e934b295a0..1afb69c75fea 100644 --- a/drivers/s390/crypto/zcrypt_pcica.c +++ b/drivers/s390/crypto/zcrypt_pcica.c | |||
| @@ -373,6 +373,7 @@ static int zcrypt_pcica_probe(struct ap_device *ap_dev) | |||
| 373 | zdev->min_mod_size = PCICA_MIN_MOD_SIZE; | 373 | zdev->min_mod_size = PCICA_MIN_MOD_SIZE; |
| 374 | zdev->max_mod_size = PCICA_MAX_MOD_SIZE; | 374 | zdev->max_mod_size = PCICA_MAX_MOD_SIZE; |
| 375 | zdev->speed_rating = PCICA_SPEED_RATING; | 375 | zdev->speed_rating = PCICA_SPEED_RATING; |
| 376 | zdev->max_exp_bit_length = PCICA_MAX_MOD_SIZE; | ||
| 376 | ap_dev->reply = &zdev->reply; | 377 | ap_dev->reply = &zdev->reply; |
| 377 | ap_dev->private = zdev; | 378 | ap_dev->private = zdev; |
| 378 | rc = zcrypt_device_register(zdev); | 379 | rc = zcrypt_device_register(zdev); |