Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-12 08:48:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

opti621: fix deadlock on error handling

Browse Source 
* 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.

* Bump driver version.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2007-10-20 00:32:35 +02:00
parent f949820de3
commit e65dde715c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/ide/pci/opti621.c
View File

@ -1,5 +1,5 @@
/* /*
* linux/drivers/ide/pci/opti621.c Version 0.8 Aug 27, 2007 * linux/drivers/ide/pci/opti621.c Version 0.9 Sep 24, 2007
* *
* Copyright (C) 1996-1998 Linus Torvalds & authors (see below) * Copyright (C) 1996-1998 Linus Torvalds & authors (see below)
*/ */
@ -133,6 +133,8 @@ static int reg_base;
#define PIO_NOT_EXIST 254 #define PIO_NOT_EXIST 254
#define PIO_DONT_KNOW 255 #define PIO_DONT_KNOW 255
static DEFINE_SPINLOCK(opti621_lock);
/* there are stored pio numbers from other calls of opti621_set_pio_mode */ /* there are stored pio numbers from other calls of opti621_set_pio_mode */
static void compute_pios(ide_drive_t *drive, const u8 pio) static void compute_pios(ide_drive_t *drive, const u8 pio)
/* Store values into drive->drive_data /* Store values into drive->drive_data
@ -278,7 +280,7 @@ static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio)
second.recovery_time, drdy); second.recovery_time, drdy);
#endif #endif
spin_lock_irqsave(&ide_lock, flags); spin_lock_irqsave(&opti621_lock, flags);
reg_base = hwif->io_ports[IDE_DATA_OFFSET]; reg_base = hwif->io_ports[IDE_DATA_OFFSET];
@ -317,7 +319,7 @@ static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio)
/* and read prefetch for both drives */ /* and read prefetch for both drives */
write_reg(misc, MISC_REG); write_reg(misc, MISC_REG);
spin_unlock_irqrestore(&ide_lock, flags); spin_unlock_irqrestore(&opti621_lock, flags);
} }
/* /*