---

yaml --- r: 356127 b: refs/heads/master c: be4904e h: refs/heads/master i: 356125: 15b788c 356123: efcc2e5 356119: 97d5488 356111: 1f18a84 356095: e047899 v: v3
git-mirror · Feb 14, 2013 · b965d79 · b965d79
1 parent 2caaa47
commit b965d79
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53923354d69e4748506bfee932b7c6b309a15c21
+refs/heads/master: be4904e5039a769f84f933bacce85c5e8ddd90a7
diff --git a/trunk/drivers/s390/block/dasd.c b/trunk/drivers/s390/block/dasd.c
@@ -3042,12 +3042,15 @@ void dasd_generic_remove(struct ccw_device *cdev)
 	cdev->handler = NULL;
 
 	device = dasd_device_from_cdev(cdev);
-	if (IS_ERR(device))
+	if (IS_ERR(device)) {
+		dasd_remove_sysfs_files(cdev);
 		return;
+	}
 	if (test_and_set_bit(DASD_FLAG_OFFLINE, &device->flags) &&
 	    !test_bit(DASD_FLAG_SAFE_OFFLINE_RUNNING, &device->flags)) {
 		/* Already doing offline processing */
 		dasd_put_device(device);
+		dasd_remove_sysfs_files(cdev);
 		return;
 	}
 	/*