From: Cornelia Huck <cornelia.huck@de.ibm.com>
Date: Sat, 26 Jan 2008 13:10:49 +0000 (+0100)
Subject: [S390] cio: Delete timer in ccw_device_verify_done().
X-Git-Tag: v2.6.25-rc1~1228^2~42
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=46258ab5e42eed5cbe20a83b732d6538c49ea2fe;p=linux-2.6-omap-h63xx.git

[S390] cio: Delete timer in ccw_device_verify_done().

Make sure pending timers are always deleted, even if we don't go
through ccw_device_done().

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/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 669e6a75f54..485741a1212 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -641,9 +641,10 @@ ccw_device_verify_done(struct ccw_device *cdev, int err)
 	default:
 		/* Reset oper notify indication after verify error. */
 		cdev->private->flags.donotify = 0;
-		if (cdev->online)
+		if (cdev->online) {
+			ccw_device_set_timeout(cdev, 0);
 			dev_fsm_event(cdev, DEV_EVENT_NOTOPER);
-		else
+		} else
 			ccw_device_done(cdev, DEV_STATE_NOT_OPER);
 		break;
 	}