---

yaml --- r: 76257 b: refs/heads/master c: c52ea91 h: refs/heads/master i: 76255: 1948a05 v: v3
git-mirror · Jan 25, 2008 · f853cc9 · f853cc9
1 parent 6a0f3a4
commit f853cc9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57d7366b78b74a9eef873e8212c03d8c2033a764
+refs/heads/master: c52ea915d7fdc96819964b32eb124b5ccd22b9af
diff --git a/trunk/drivers/ide/ide-disk.c b/trunk/drivers/ide/ide-disk.c
@@ -236,7 +236,8 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
 			command = lba48 ? WIN_READ_EXT : WIN_READ;
 		}
 
-		ide_execute_command(drive, command, &task_in_intr, WAIT_CMD, NULL);
+		ide_execute_command(drive, command, &task_in_intr,
+				    WAIT_WORSTCASE, NULL);
 		return ide_started;
 	} else {
 		if (drive->mult_count) {