]> err.no Git - linux-2.6/commitdiff
[PATCH] s390: ccw device reconnect oops.
authorCornelia Huck <cohuck@de.ibm.com>
Tue, 11 Oct 2005 15:28:59 +0000 (08:28 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 11 Oct 2005 16:46:53 +0000 (09:46 -0700)
Search for a disconnect ccw_device on the ccw bus rather than on the css
bus (was a typo in patch I did for the klist conversion).  A cast to an
embedding ccw_device from an embedded device in a struct subchannel will
lead us to oopses.

Signed-off-by: Cornelia Huck <cohuck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/s390/cio/device.c

index 14c76f5e417708ebbd22321ebda46ed9cd5d79b3..9adc11e8b8bcea7f30cd5075ca8a802d6ccb5e78 100644 (file)
@@ -544,7 +544,7 @@ get_disc_ccwdev_by_devno(unsigned int devno, struct ccw_device *sibling)
                .sibling = sibling,
        };
 
-       dev = bus_find_device(&css_bus_type, NULL, &data, match_devno);
+       dev = bus_find_device(&ccw_bus_type, NULL, &data, match_devno);
 
        return dev ? to_ccwdev(dev) : NULL;
 }