From ca525ffcd1b6adc9290a90265593b601ad101a27 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sat, 20 Oct 2007 00:32:35 +0200 Subject: [PATCH] --- yaml --- r: 71767 b: refs/heads/master c: 2047e15be4247efd430d067aae5bd24c11d99999 h: refs/heads/master i: 71765: 9f1aec77e7f3d7aa75bc36ac6e97fbc94a5f926b 71763: 498bb48748f71db4ae3729b8a2aba4d1aabffb4d 71759: 190de572a5c7abc5ad6c7345ac46fe0f299ea752 v: v3 --- [refs] | 2 +- trunk/drivers/ide/legacy/ali14xx.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1ba15633ba6b..1a46cc655388 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8562043606430185cad26d085d46adcc7ad67fd1 +refs/heads/master: 2047e15be4247efd430d067aae5bd24c11d99999 diff --git a/trunk/drivers/ide/legacy/ali14xx.c b/trunk/drivers/ide/legacy/ali14xx.c index 0973c85e49b7..10311ecc674a 100644 --- a/trunk/drivers/ide/legacy/ali14xx.c +++ b/trunk/drivers/ide/legacy/ali14xx.c @@ -102,6 +102,8 @@ static void outReg (u8 data, u8 reg) outb_p(data, dataPort); } +static DEFINE_SPINLOCK(ali14xx_lock); + /* * Set PIO mode for the specified drive. * This function computes timing parameters @@ -129,14 +131,14 @@ static void ali14xx_set_pio_mode(ide_drive_t *drive, const u8 pio) /* stuff timing parameters into controller registers */ driveNum = (HWIF(drive)->index << 1) + drive->select.b.unit; - spin_lock_irqsave(&ide_lock, flags); + spin_lock_irqsave(&ali14xx_lock, flags); outb_p(regOn, basePort); outReg(param1, regTab[driveNum].reg1); outReg(param2, regTab[driveNum].reg2); outReg(param3, regTab[driveNum].reg3); outReg(param4, regTab[driveNum].reg4); outb_p(regOff, basePort); - spin_unlock_irqrestore(&ide_lock, flags); + spin_unlock_irqrestore(&ali14xx_lock, flags); } /*