Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/ide/ide.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/ide/ide.c~ide-mm-ide-remove-redundant-ide_dma_on-call-from-set_using_dma drivers/ide/ide.c
--- a/drivers/ide/ide.c~ide-mm-ide-remove-redundant-ide_dma_on-call-from-set_using_dma
+++ a/drivers/ide/ide.c
@@ -852,7 +852,7 @@ int set_using_dma(ide_drive_t *drive, in
 
 	if (arg) {
 		hwif->dma_off_quietly(drive);
-		if (ide_set_dma(drive) || hwif->ide_dma_on(drive))
+		if (ide_set_dma(drive))
 			err = -EIO;
 	} else
 		ide_dma_off(drive);
_