diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/ide/ide-dma.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/ide/ide-dma.c')
| -rw-r--r-- | drivers/ide/ide-dma.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index ee58c88dee5a..06b14bc9a1d4 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/types.h> | 31 | #include <linux/types.h> |
| 32 | #include <linux/gfp.h> | ||
| 32 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
| 33 | #include <linux/ide.h> | 34 | #include <linux/ide.h> |
| 34 | #include <linux/scatterlist.h> | 35 | #include <linux/scatterlist.h> |
| @@ -492,6 +493,7 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) | |||
| 492 | if (rq) { | 493 | if (rq) { |
| 493 | hwif->rq = NULL; | 494 | hwif->rq = NULL; |
| 494 | rq->errors = 0; | 495 | rq->errors = 0; |
| 496 | ide_requeue_and_plug(drive, rq); | ||
| 495 | } | 497 | } |
| 496 | return ret; | 498 | return ret; |
| 497 | } | 499 | } |