diff options
| author |   Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-12-12 23:32:00 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-12-12 23:32:00 +0100 |
| commit | 644a9d764b4747af057b3db73ccba28a168b1f4f (patch) | |
| tree | 0f692a2e67433b4072856f38a489e0d6fe3c2338 /drivers/ide | |
| parent | ide: remove stale changelog from ide-probe.c (diff) | |
| download | linux-dev-644a9d764b4747af057b3db73ccba28a168b1f4f.tar.xz linux-dev-644a9d764b4747af057b3db73ccba28a168b1f4f.zip | |
ide: fix ->io_32bit race in set_io_32bit()
set_io_32bit() (ide_procset_t function) can race against running
PIO transfers. Fix it by using ide_spin_wait_hwgroup().
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 85740ae5d689..54943da6e4e5 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c @@ -800,11 +800,17 @@ int set_io_32bit(ide_drive_t *drive, int arg) if (arg < 0 || arg > 1 + (SUPPORT_VLB_SYNC << 1)) return -EINVAL; + if (ide_spin_wait_hwgroup(drive)) + return -EBUSY; + drive->io_32bit = arg; #ifdef CONFIG_BLK_DEV_DTC2278 if (HWIF(drive)->chipset == ide_dtc2278) HWIF(drive)->drives[!drive->select.b.unit].io_32bit = arg; #endif /* CONFIG_BLK_DEV_DTC2278 */ + + spin_unlock_irq(&ide_lock); + return 0; } |