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

Commit a34a8751 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

dtc2278: fix deadlock on error handling 



Stop abusing ide_lock lock (switch to a private locking).

Fixes same issue as fixed by Alan Cox in atiixp host driver with
commit 6c5f8cc3.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 2047e15b

drivers/ide/legacy/dtc2278.c

+4 −2
Original line number Diff line number Diff line
@@ -67,18 +67,20 @@ static void sub22 (char b, char c) 
	}

}



static DEFINE_SPINLOCK(dtc2278_lock);



static void dtc2278_set_pio_mode(ide_drive_t *drive, const u8 pio)

{

	unsigned long flags;



	if (pio >= 3) {

		spin_lock_irqsave(&ide_lock, flags);

		spin_lock_irqsave(&dtc2278_lock, flags);

		/*

		 * This enables PIO mode4 (3?) on the first interface

		 */

		sub22(1,0xc3);

		sub22(0,0xa0);

		spin_unlock_irqrestore(&ide_lock, flags);

		spin_unlock_irqrestore(&dtc2278_lock, flags);

	} else {

		/* we don't know how to set it back again.. */

	}