diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:19:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:19:48 +0100 |
| commit | 818fa7f3908c7bd6c0045e9d94dc23a899ef6144 (patch) | |
| tree | ad3435c3f57c8222ad61709b716168932f13be6c /drivers/ide/umc8672.c | |
| parent | 3fd4bc015ef879a7d2b955ce97fb125e3a51ba7e (diff) | |
| parent | 5fdf7e5975a0b0f6a0370655612c5dca3fd6311b (diff) | |
| download | op-kernel-dev-818fa7f3908c7bd6c0045e9d94dc23a899ef6144.zip op-kernel-dev-818fa7f3908c7bd6c0045e9d94dc23a899ef6144.tar.gz | |
Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2
Diffstat (limited to 'drivers/ide/umc8672.c')
| -rw-r--r-- | drivers/ide/umc8672.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/ide/umc8672.c b/drivers/ide/umc8672.c index 1da076e..e29978c 100644 --- a/drivers/ide/umc8672.c +++ b/drivers/ide/umc8672.c @@ -107,18 +107,21 @@ static void umc_set_speeds(u8 speeds[]) static void umc_set_pio_mode(ide_drive_t *drive, const u8 pio) { ide_hwif_t *hwif = drive->hwif; - unsigned long flags; + ide_hwgroup_t *mate_hwgroup = hwif->mate ? hwif->mate->hwgroup : NULL; + unsigned long uninitialized_var(flags); printk("%s: setting umc8672 to PIO mode%d (speed %d)\n", drive->name, pio, pio_to_umc[pio]); - spin_lock_irqsave(&ide_lock, flags); - if (hwif->mate && hwif->mate->hwgroup->handler) { + if (mate_hwgroup) + spin_lock_irqsave(&mate_hwgroup->lock, flags); + if (mate_hwgroup && mate_hwgroup->handler) { printk(KERN_ERR "umc8672: other interface is busy: exiting tune_umc()\n"); } else { current_speeds[drive->name[2] - 'a'] = pio_to_umc[pio]; umc_set_speeds(current_speeds); } - spin_unlock_irqrestore(&ide_lock, flags); + if (mate_hwgroup) + spin_unlock_irqrestore(&mate_hwgroup->lock, flags); } static const struct ide_port_ops umc8672_port_ops = { |
