fix console change race exposed by CFS

[pandora-kernel.git] / drivers / ide / ide-io.c

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index f9de798..aa9f5f0 100644 (file)
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -224,11 +224,12 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
                 * we could be smarter and check for current xfer_speed
                 * in struct drive etc...
                 */
-               if ((drive->id->capability & 1) == 0)
-                       break;
                if (drive->hwif->ide_dma_check == NULL)
                        break;
                drive->hwif->dma_off_quietly(drive);
+               /*
+                * TODO: respect ->using_dma setting
+                */
                ide_set_dma(drive);
                break;
        }
@@ -1326,7 +1327,7 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)
 /*
  * Passes the stuff to ide_do_request
  */
-void do_ide_request(request_queue_t *q)
+void do_ide_request(struct request_queue *q)
 {
        ide_drive_t *drive = q->queuedata;