From ba2f53b3ff3d59bf34f92f36eb27643bceb5900b Mon Sep 17 00:00:00 2001 From: Cornelia Huck Date: Sat, 26 Jan 2008 14:10:50 +0100 Subject: [PATCH] --- yaml --- r: 77185 b: refs/heads/master c: 1a908c735aed44c8bbed303371202e416813b271 h: refs/heads/master i: 77183: 9c3dbdd75fefe56e16494f5813f2f2038918ef1d v: v3 --- [refs] | 2 +- trunk/drivers/s390/cio/ccwgroup.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 82a3c8b14708..aa02d67e08d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46258ab5e42eed5cbe20a83b732d6538c49ea2fe +refs/heads/master: 1a908c735aed44c8bbed303371202e416813b271 diff --git a/trunk/drivers/s390/cio/ccwgroup.c b/trunk/drivers/s390/cio/ccwgroup.c index dc1c5f4dd256..3964056a9a47 100644 --- a/trunk/drivers/s390/cio/ccwgroup.c +++ b/trunk/drivers/s390/cio/ccwgroup.c @@ -75,8 +75,10 @@ static void ccwgroup_ungroup_callback(struct device *dev) struct ccwgroup_device *gdev = to_ccwgroupdev(dev); mutex_lock(&gdev->reg_mutex); - __ccwgroup_remove_symlinks(gdev); - device_unregister(dev); + if (device_is_registered(&gdev->dev)) { + __ccwgroup_remove_symlinks(gdev); + device_unregister(dev); + } mutex_unlock(&gdev->reg_mutex); }