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

Commit e4c14e20 authored by Jan Glauber's avatar Jan Glauber Committed by Martin Schwidefsky
Browse files

[S390] qdio: Dont call qdio_shutdown in case qdio_activate fails 



Remove the call to qdio_shutdown from qdio_activate since the upper-layer
drivers are responsible to call qdio_shutdown when qdio_activate returns
with an error.

Signed-off-by: default avatarJan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent b4547402

drivers/s390/cio/qdio_main.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -1404,9 +1404,8 @@ int qdio_activate(struct ccw_device *cdev) 
	switch (irq_ptr->state) {

	switch (irq_ptr->state) {

	case QDIO_IRQ_STATE_STOPPED:

	case QDIO_IRQ_STATE_STOPPED:

	case QDIO_IRQ_STATE_ERR:

	case QDIO_IRQ_STATE_ERR:

		mutex_unlock(&irq_ptr->setup_mutex);

		rc = -EIO;

		qdio_shutdown(cdev, QDIO_FLAG_CLEANUP_USING_CLEAR);

		break;

		return -EIO;

	default:

	default:

		qdio_set_state(irq_ptr, QDIO_IRQ_STATE_ACTIVE);

		qdio_set_state(irq_ptr, QDIO_IRQ_STATE_ACTIVE);

		rc = 0;

		rc = 0;