Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / drivers / s390 / char / tape_core.c

diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 2826aed..e6e4086 100644 (file)
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -11,6 +11,7 @@
  *              Stefan Bader <shbader@de.ibm.com>
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>             // for kernel parameters
 #include <linux/kmod.h>             // for requesting modules
@@ -543,24 +544,20 @@ int
 tape_generic_probe(struct ccw_device *cdev)
 {
        struct tape_device *device;
-       int ret;
 
        device = tape_alloc_device();
        if (IS_ERR(device))
                return -ENODEV;
-       ccw_device_set_options(cdev, CCWDEV_DO_PATHGROUP);
-       ret = sysfs_create_group(&cdev->dev.kobj, &tape_attr_group);
-       if (ret) {
-               tape_put_device(device);
-               PRINT_ERR("probe failed for tape device %s\n", cdev->dev.bus_id);
-               return ret;
-       }
+       PRINT_INFO("tape device %s found\n", cdev->dev.bus_id);
        cdev->dev.driver_data = device;
-       cdev->handler = __tape_do_irq;
        device->cdev = cdev;
        device->cdev_id = busid_to_int(cdev->dev.bus_id);
-       PRINT_INFO("tape device %s found\n", cdev->dev.bus_id);
-       return ret;
+       cdev->handler = __tape_do_irq;
+
+       ccw_device_set_options(cdev, CCWDEV_DO_PATHGROUP);
+       sysfs_create_group(&cdev->dev.kobj, &tape_attr_group);
+
+       return 0;
 }
 
 static inline void