Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Holger Dengler and committed by
Martin Schwidefsky
cf2d007b 89db4df1

+8 -2
+2
drivers/crypto/Kconfig
··· 74 74 + PCI-X Cryptographic Coprocessor (PCIXCC) 75 75 + Crypto Express2 Coprocessor (CEX2C) 76 76 + Crypto Express2 Accelerator (CEX2A) 77 + + Crypto Express3 Coprocessor (CEX3C) 78 + + Crypto Express3 Accelerator (CEX3A) 77 79 78 80 config ZCRYPT_MONOLITHIC 79 81 bool "Monolithic zcrypt module"
+6 -2
drivers/s390/crypto/ap_bus.c
··· 1183 1183 INIT_LIST_HEAD(&ap_dev->list); 1184 1184 setup_timer(&ap_dev->timeout, ap_request_timeout, 1185 1185 (unsigned long) ap_dev); 1186 - if (device_type == 0) 1187 - ap_probe_device_type(ap_dev); 1186 + if (device_type == 0) { 1187 + if (ap_probe_device_type(ap_dev)) { 1188 + kfree(ap_dev); 1189 + continue; 1190 + } 1191 + } 1188 1192 else 1189 1193 ap_dev->device_type = device_type; 1190 1194