diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-27 10:08:06 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-27 10:08:06 +1000 |
| commit | a15f2589519f9cd00c11e07bc4f5a574aac5c347 (patch) | |
| tree | bf78111d2653117de2201e76b38fcbf6912e7f19 /drivers/s390/crypto/ap_bus.c | |
| parent | c6f2f12a1ed8966abd427170c0a762ea75cf8681 (diff) | |
| parent | 22b8d2fa5ae58a62bcbff82cbed9084b63c3cd1a (diff) | |
Merge remote-tracking branch 's390/features'
Diffstat (limited to 'drivers/s390/crypto/ap_bus.c')
| -rw-r--r-- | drivers/s390/crypto/ap_bus.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c index 67302b944ab3..16e4a25596e7 100644 --- a/drivers/s390/crypto/ap_bus.c +++ b/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; |