diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 04:52:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 04:52:59 -0400 |
| commit | a60b33cf59d1c9e0e363287fce799cb23d45660c (patch) | |
| tree | 85eb8feea5717cf472a2549e53f59183a95617c5 /drivers/ide/ide-taskfile.c | |
| parent | 0f476b6d91a1395bda6464e653ce66ea9bea7167 (diff) | |
| parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
Merge branch 'linus' into core/softirq
Diffstat (limited to 'drivers/ide/ide-taskfile.c')
| -rw-r--r-- | drivers/ide/ide-taskfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index 0c908ca3ff79..ab545ffa1549 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c | |||
| @@ -225,10 +225,10 @@ static u8 wait_drive_not_busy(ide_drive_t *drive) | |||
| 225 | u8 stat; | 225 | u8 stat; |
| 226 | 226 | ||
| 227 | /* | 227 | /* |
| 228 | * Last sector was transfered, wait until drive is ready. | 228 | * Last sector was transfered, wait until device is ready. This can |
| 229 | * This can take up to 10 usec, but we will wait max 1 ms. | 229 | * take up to 6 ms on some ATAPI devices, so we will wait max 10 ms. |
| 230 | */ | 230 | */ |
| 231 | for (retries = 0; retries < 100; retries++) { | 231 | for (retries = 0; retries < 1000; retries++) { |
| 232 | stat = ide_read_status(drive); | 232 | stat = ide_read_status(drive); |
| 233 | 233 | ||
| 234 | if (stat & BUSY_STAT) | 234 | if (stat & BUSY_STAT) |