git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
[safe/jmp/linux-2.6]
/
drivers
/
ide
/
ide-dma.c
diff --git
a/drivers/ide/ide-dma.c
b/drivers/ide/ide-dma.c
index
ee58c88
..
06b14bc
100644
(file)
--- a/
drivers/ide/ide-dma.c
+++ b/
drivers/ide/ide-dma.c
@@
-29,6
+29,7
@@
*/
#include <linux/types.h>
+#include <linux/gfp.h>
#include <linux/kernel.h>
#include <linux/ide.h>
#include <linux/scatterlist.h>
@@
-492,6
+493,7
@@
ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
if (rq) {
hwif->rq = NULL;
rq->errors = 0;
+ ide_requeue_and_plug(drive, rq);
}
return ret;
}