Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5945b4f authored by Cornelia Huck's avatar Cornelia Huck Committed by Linus Torvalds
Browse files

[PATCH] s390: ccw device reconnect oops. 



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: default avatarCornelia Huck <cohuck@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 907a4261

drivers/s390/cio/device.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}