---

yaml --- r: 157465 b: refs/heads/master c: edc44fa h: refs/heads/master i: 157463: ef20111 v: v3
git-mirror · Sep 11, 2009 · f31713f · f31713f
1 parent 49bc039
commit f31713f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95f1556c35529a162cef50296f3dc7f978852048
+refs/heads/master: edc44fa03ed7bc9847787e080190cf1d7ed68ceb
diff --git a/trunk/drivers/s390/crypto/ap_bus.c b/trunk/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) {