diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2008-01-26 14:10:40 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-01-26 14:10:57 +0100 |
| commit | 98c13c283a4e8b7f844f1f470abd7c756248fcc4 (patch) | |
| tree | d48ed417849c6dbe938c7e18d93066ec66fb129a | |
| parent | 602b20f2bf335d0d5fce11cb2ade22aa74e7ba25 (diff) | |
| download | blackbird-op-linux-98c13c283a4e8b7f844f1f470abd7c756248fcc4.tar.gz blackbird-op-linux-98c13c283a4e8b7f844f1f470abd7c756248fcc4.zip | |
[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>
| -rw-r--r-- | drivers/s390/cio/css.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c index 614cc694184e..f558686a66dd 100644 --- 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); } |
