dtc2278: fix deadlock on error handling

PATCH NAK Bartlomiej Zolnierkiewicz 1 participant 1 message Oct 1, 2007 libata

lore

Share & tools

lore

Bartlomiej Zolnierkiewicz

author

2007-10-01 21:39 UTC #0 lore raw

PATCH 2/15 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 6c5f8cc33eb2e10b6ab788bbe259fc142a068627.

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

---
 drivers/ide/legacy/dtc2278.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

drivers/ide/legacy/dtc2278.c +4 -2

Index: b/drivers/ide/legacy/dtc2278.c
===================================================================
@@ -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.. */
 	}