From: Peter Oberparleiter Date: Mon, 7 Dec 2009 11:51:23 +0000 (+0100) Subject: [S390] cio: ensure proper locking during device recognition X-Git-Tag: MMI-PSA29.97-13-9~25715^2~62 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1f5bd3848bfc56de4c32ef6971a6a966776204bb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [S390] cio: ensure proper locking during device recognition Device recognition needs to be started with the ccw device lock held to prevent race conditions between I/O starting and interrupt reception. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky --- diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 7ad6bfb2e55e..afa362ce9e85 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c @@ -488,7 +488,9 @@ static int online_store_recog_and_online(struct ccw_device *cdev) { /* Do device recognition, if needed. */ if (cdev->private->state == DEV_STATE_BOXED) { + spin_lock_irq(cdev->ccwlock); ccw_device_recognition(cdev); + spin_unlock_irq(cdev->ccwlock); wait_event(cdev->private->wait_q, cdev->private->flags.recog_done); if (cdev->private->state != DEV_STATE_OFFLINE)