diff options
| author | Greg KH <greg@press.(none)> | 2005-06-28 01:07:56 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-28 01:07:56 -0400 |
| commit | 8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (patch) | |
| tree | c43b6c2fdf1b68b66906a2de69446dcec0f9af6b /drivers/ide/ide-iops.c | |
| parent | 1cde8a16815bd85c8137d1ea556398983c597c11 (diff) | |
| parent | 99f95e5286df2f69edab8a04c7080d986ee4233b (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ide/ide-iops.c')
| -rw-r--r-- | drivers/ide/ide-iops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index 53024942a7eb..b443b04a4c5a 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c | |||
| @@ -1181,7 +1181,8 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi) | |||
| 1181 | pre_reset(drive); | 1181 | pre_reset(drive); |
| 1182 | SELECT_DRIVE(drive); | 1182 | SELECT_DRIVE(drive); |
| 1183 | udelay (20); | 1183 | udelay (20); |
| 1184 | hwif->OUTB(WIN_SRST, IDE_COMMAND_REG); | 1184 | hwif->OUTBSYNC(drive, WIN_SRST, IDE_COMMAND_REG); |
| 1185 | ndelay(400); | ||
| 1185 | hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE; | 1186 | hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE; |
| 1186 | hwgroup->polling = 1; | 1187 | hwgroup->polling = 1; |
| 1187 | __ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20, NULL); | 1188 | __ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20, NULL); |