diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-12-07 06:52:02 -0500 |
---|---|---|
committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2009-12-07 06:51:36 -0500 |
commit | 1b52fff059d660d4bf83d97c389dd80f1e6aad9a (patch) | |
tree | ac86a09d41e8e7301e8740f82ed0782cfe61330f /drivers/s390 | |
parent | c1b283d55d1806680e3ad1cfbef581afecbea5cb (diff) |
[S390] tape: fix tape remove function
Fix a bug introduced with git commit dff59b64af94dc58:
- if (cdev->dev.driver_data != NULL) {
+ if (!dev_get_drvdata(&cdev->dev)) {
These two are not equivalent.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/char/tape_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c index 27503a778fcb..6311018e6543 100644 --- a/drivers/s390/char/tape_core.c +++ b/drivers/s390/char/tape_core.c | |||
@@ -665,7 +665,7 @@ tape_generic_remove(struct ccw_device *cdev) | |||
665 | tape_cleanup_device(device); | 665 | tape_cleanup_device(device); |
666 | } | 666 | } |
667 | 667 | ||
668 | if (!dev_get_drvdata(&cdev->dev)) { | 668 | if (dev_get_drvdata(&cdev->dev)) { |
669 | sysfs_remove_group(&cdev->dev.kobj, &tape_attr_group); | 669 | sysfs_remove_group(&cdev->dev.kobj, &tape_attr_group); |
670 | dev_set_drvdata(&cdev->dev, tape_put_device(dev_get_drvdata(&cdev->dev))); | 670 | dev_set_drvdata(&cdev->dev, tape_put_device(dev_get_drvdata(&cdev->dev))); |
671 | } | 671 | } |