diff options
Diffstat (limited to 'drivers/ide/ide-iops.c')
-rw-r--r-- | drivers/ide/ide-iops.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index 77703acaec17..badde6331775 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c | |||
@@ -998,6 +998,7 @@ static ide_startstop_t atapi_reset_pollfunc (ide_drive_t *drive) | |||
998 | } | 998 | } |
999 | /* done polling */ | 999 | /* done polling */ |
1000 | hwgroup->polling = 0; | 1000 | hwgroup->polling = 0; |
1001 | hwgroup->resetting = 0; | ||
1001 | return ide_stopped; | 1002 | return ide_stopped; |
1002 | } | 1003 | } |
1003 | 1004 | ||
@@ -1057,6 +1058,7 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive) | |||
1057 | } | 1058 | } |
1058 | } | 1059 | } |
1059 | hwgroup->polling = 0; /* done polling */ | 1060 | hwgroup->polling = 0; /* done polling */ |
1061 | hwgroup->resetting = 0; /* done reset attempt */ | ||
1060 | return ide_stopped; | 1062 | return ide_stopped; |
1061 | } | 1063 | } |
1062 | 1064 | ||
@@ -1143,6 +1145,7 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi) | |||
1143 | 1145 | ||
1144 | /* For an ATAPI device, first try an ATAPI SRST. */ | 1146 | /* For an ATAPI device, first try an ATAPI SRST. */ |
1145 | if (drive->media != ide_disk && !do_not_try_atapi) { | 1147 | if (drive->media != ide_disk && !do_not_try_atapi) { |
1148 | hwgroup->resetting = 1; | ||
1146 | pre_reset(drive); | 1149 | pre_reset(drive); |
1147 | SELECT_DRIVE(drive); | 1150 | SELECT_DRIVE(drive); |
1148 | udelay (20); | 1151 | udelay (20); |
@@ -1168,6 +1171,7 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi) | |||
1168 | return ide_stopped; | 1171 | return ide_stopped; |
1169 | } | 1172 | } |
1170 | 1173 | ||
1174 | hwgroup->resetting = 1; | ||
1171 | /* | 1175 | /* |
1172 | * Note that we also set nIEN while resetting the device, | 1176 | * Note that we also set nIEN while resetting the device, |
1173 | * to mask unwanted interrupts from the interface during the reset. | 1177 | * to mask unwanted interrupts from the interface during the reset. |