From f7f06bc651a88f27d07c89335799c9cb9075bc63 Mon Sep 17 00:00:00 2001 From: Holger Dengler Date: Mon, 23 May 2011 10:24:30 +0200 Subject: [PATCH] --- yaml --- r: 250537 b: refs/heads/master c: cf2d007bd43bc254d5254fe9d30af3e73ed5b98a h: refs/heads/master i: 250535: 04054297988e1f76ad2c4e4302801d4f7b88ba47 v: v3 --- [refs] | 2 +- trunk/drivers/crypto/Kconfig | 2 ++ trunk/drivers/s390/crypto/ap_bus.c | 8 ++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ac85826820d6..62db4562a192 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89db4df160948d005b5efce82ef10f25ab5aac8b +refs/heads/master: cf2d007bd43bc254d5254fe9d30af3e73ed5b98a diff --git a/trunk/drivers/crypto/Kconfig b/trunk/drivers/crypto/Kconfig index c64c3807f516..e0b25de1e339 100644 --- a/trunk/drivers/crypto/Kconfig +++ b/trunk/drivers/crypto/Kconfig @@ -74,6 +74,8 @@ config ZCRYPT + PCI-X Cryptographic Coprocessor (PCIXCC) + Crypto Express2 Coprocessor (CEX2C) + Crypto Express2 Accelerator (CEX2A) + + Crypto Express3 Coprocessor (CEX3C) + + Crypto Express3 Accelerator (CEX3A) config ZCRYPT_MONOLITHIC bool "Monolithic zcrypt module" diff --git a/trunk/drivers/s390/crypto/ap_bus.c b/trunk/drivers/s390/crypto/ap_bus.c index 67302b944ab3..16e4a25596e7 100644 --- a/trunk/drivers/s390/crypto/ap_bus.c +++ b/trunk/drivers/s390/crypto/ap_bus.c @@ -1183,8 +1183,12 @@ static void ap_scan_bus(struct work_struct *unused) INIT_LIST_HEAD(&ap_dev->list); setup_timer(&ap_dev->timeout, ap_request_timeout, (unsigned long) ap_dev); - if (device_type == 0) - ap_probe_device_type(ap_dev); + if (device_type == 0) { + if (ap_probe_device_type(ap_dev)) { + kfree(ap_dev); + continue; + } + } else ap_dev->device_type = device_type;