[S390] ap: skip device registration on type probe failure
The registration of an ap device will be skipped, if the device type probing fails. Add names of current crypto adapters to the Kconfig help. Signed-off-by: Holger Dengler <hd@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
parent
89db4df160
commit
cf2d007bd4
2 changed files with 8 additions and 2 deletions
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue