summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorFelix Beck <felix.beck@de.ibm.com>2009-09-11 10:28:52 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2009-09-11 10:29:51 +0200
commitedc44fa03ed7bc9847787e080190cf1d7ed68ceb (patch)
tree78b6b02e04c0edd32d123cf7ab78b333660f5d90 /drivers
parent95f1556c35529a162cef50296f3dc7f978852048 (diff)
downloadlinux-3.10-edc44fa03ed7bc9847787e080190cf1d7ed68ceb.tar.gz
linux-3.10-edc44fa03ed7bc9847787e080190cf1d7ed68ceb.tar.bz2
linux-3.10-edc44fa03ed7bc9847787e080190cf1d7ed68ceb.zip
[S390] zcrypt: Free ap_device if dev_set_name fails.
If dev_set_name fails during scanning the AP bus, the reserved memory has to be freed. Signed-off-by: Felix Beck <felix.beck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/s390/crypto/ap_bus.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 85785807acb..090b32a339c 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -1111,8 +1111,11 @@ static void ap_scan_bus(struct work_struct *unused)
ap_dev->device.bus = &ap_bus_type;
ap_dev->device.parent = ap_root_device;
- dev_set_name(&ap_dev->device, "card%02x",
- AP_QID_DEVICE(ap_dev->qid));
+ if (dev_set_name(&ap_dev->device, "card%02x",
+ AP_QID_DEVICE(ap_dev->qid))) {
+ kfree(ap_dev);
+ continue;
+ }
ap_dev->device.release = ap_device_release;
rc = device_register(&ap_dev->device);
if (rc) {