From b965d79b9864f0409cb11a52a5c7dbacdab92e76 Mon Sep 17 00:00:00 2001 From: Stefan Weinhuber Date: Mon, 4 Feb 2013 13:10:35 +0100 Subject: [PATCH] --- yaml --- r: 356127 b: refs/heads/master c: be4904e5039a769f84f933bacce85c5e8ddd90a7 h: refs/heads/master i: 356125: 15b788c41c281e61b9ec7d7e391bd4cf4f8834b1 356123: efcc2e5a79f65ff32ee94cb32814531fa756c5bf 356119: 97d54889b58c2cfcbab0a6cbaa7bab4f282ee1b5 356111: 1f18a84cf9e6dce6d142520203d03a98d2b3b458 356095: e047899bc7cb5717f27d9d7172af692723a37da1 v: v3 --- [refs] | 2 +- trunk/drivers/s390/block/dasd.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index be33eb3f9134..e9991279aa15 100644 --- 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 index e1d96344d733..f1b7fdc58a5f 100644 --- 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; } /*