提交 cf2d007b 编写于 作者: H Holger Dengler 提交者: Martin Schwidefsky

[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: NHolger Dengler <hd@linux.vnet.ibm.com>
Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
上级 89db4df1
...@@ -74,6 +74,8 @@ config ZCRYPT ...@@ -74,6 +74,8 @@ config ZCRYPT
+ PCI-X Cryptographic Coprocessor (PCIXCC) + PCI-X Cryptographic Coprocessor (PCIXCC)
+ Crypto Express2 Coprocessor (CEX2C) + Crypto Express2 Coprocessor (CEX2C)
+ Crypto Express2 Accelerator (CEX2A) + Crypto Express2 Accelerator (CEX2A)
+ Crypto Express3 Coprocessor (CEX3C)
+ Crypto Express3 Accelerator (CEX3A)
config ZCRYPT_MONOLITHIC config ZCRYPT_MONOLITHIC
bool "Monolithic zcrypt module" bool "Monolithic zcrypt module"
......
...@@ -1183,8 +1183,12 @@ static void ap_scan_bus(struct work_struct *unused) ...@@ -1183,8 +1183,12 @@ static void ap_scan_bus(struct work_struct *unused)
INIT_LIST_HEAD(&ap_dev->list); INIT_LIST_HEAD(&ap_dev->list);
setup_timer(&ap_dev->timeout, ap_request_timeout, setup_timer(&ap_dev->timeout, ap_request_timeout,
(unsigned long) ap_dev); (unsigned long) ap_dev);
if (device_type == 0) if (device_type == 0) {
ap_probe_device_type(ap_dev); if (ap_probe_device_type(ap_dev)) {
kfree(ap_dev);
continue;
}
}
else else
ap_dev->device_type = device_type; ap_dev->device_type = device_type;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册