diff --git a/[refs] b/[refs] index 5b2ab40c7e59..0d54cde8203c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4eed504d140319d6c1c7e0a5b7a9bf41dabf7cea +refs/heads/master: 23b1bd459c9e8a925381960f0b69ac85468c3af1 diff --git a/trunk/drivers/ide/ide.c b/trunk/drivers/ide/ide.c index 4acd87e92cca..00ef6ec2c273 100644 --- a/trunk/drivers/ide/ide.c +++ b/trunk/drivers/ide/ide.c @@ -852,7 +852,7 @@ int set_using_dma(ide_drive_t *drive, int arg) 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);