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

Commit 46258ab5 authored by Cornelia Huck's avatar Cornelia Huck Committed by Martin Schwidefsky
Browse files

[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: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent e82a1567

drivers/s390/cio/device_fsm.c

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

	}