[S390] cio: Reset sch->driver.

sch->driver needs to be reset to NULL on failed probe and after
remove. We also need to check for sch->driver on shutdown.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 614cc694184ed4a40cb48246da4df7df8acc4dc8..f558686a66dd97a9e8bf467354570d4ab536e49b 100644 (file)
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -796,32 +796,36 @@ css_bus_match (struct device *dev, struct device_driver *drv)
        return 0;
 }
 
-static int
-css_probe (struct device *dev)
+static int css_probe(struct device *dev)
 {
        struct subchannel *sch;
+       int ret;
 
        sch = to_subchannel(dev);
        sch->driver = to_cssdriver(dev->driver);
-       return (sch->driver->probe ? sch->driver->probe(sch) : 0);
+       ret = sch->driver->probe ? sch->driver->probe(sch) : 0;
+       if (ret)
+               sch->driver = NULL;
+       return ret;
 }
 
-static int
-css_remove (struct device *dev)
+static int css_remove(struct device *dev)
 {
        struct subchannel *sch;
+       int ret;
 
        sch = to_subchannel(dev);
-       return (sch->driver->remove ? sch->driver->remove(sch) : 0);
+       ret = sch->driver->remove ? sch->driver->remove(sch) : 0;
+       sch->driver = NULL;
+       return ret;
 }
 
-static void
-css_shutdown (struct device *dev)
+static void css_shutdown(struct device *dev)
 {
        struct subchannel *sch;
 
        sch = to_subchannel(dev);
-       if (sch->driver->shutdown)
+       if (sch->driver && sch->driver->shutdown)
                sch->driver->shutdown(sch);
 }