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

Commit 7a8ad100 authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

[S390] cio: change locking in io_subchannel_remove 



IO subchannels are always unregistered in process context, so use
spin_lock_irq in the corresponding remove callback.

Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 6e9a0f67

drivers/s390/cio/device.c

+2 −3
Original line number Diff line number Diff line
@@ -1065,17 +1065,16 @@ static int 
io_subchannel_remove (struct subchannel *sch)

{

	struct ccw_device *cdev;

	unsigned long flags;



	cdev = sch_get_cdev(sch);

	if (!cdev)

		goto out_free;

	io_subchannel_quiesce(sch);

	/* Set ccw device to not operational and drop reference. */

	spin_lock_irqsave(cdev->ccwlock, flags);

	spin_lock_irq(cdev->ccwlock);

	sch_set_cdev(sch, NULL);

	cdev->private->state = DEV_STATE_NOT_OPER;

	spin_unlock_irqrestore(cdev->ccwlock, flags);

	spin_unlock_irq(cdev->ccwlock);

	ccw_device_unregister(cdev);

out_free:

	kfree(sch->private);