[PATCH] ide tcq enable

A recent change moved the tcq init too early in the init sequence, the
queue isn't initialized at this point which causes the task file
executions to kill elevator with a NULL EIP (->add_req_fn()).  This
patch fixes it, acked by Bart.

drivers/ide/ide-disk.c

@@ -1665,6 +1665,10 @@ static void idedisk_setup (ide_drive_t *drive)
 	drive->no_io_32bit = id->dword_io ? 1 : 0;
 	if (drive->id->cfs_enable_2 & 0x3000)
 		write_cache(drive, (id->cfs_enable_2 & 0x3000));
+
+#ifdef CONFIG_BLK_DEV_IDE_TCQ_DEFAULT
+	HWIF(drive)->ide_dma_queued_on(drive);
+#endif
 }
 
 static int idedisk_cleanup (ide_drive_t *drive)

drivers/ide/ide-dma.c

@@ -570,10 +570,6 @@ int __ide_dma_on (ide_drive_t *drive)
 	if (HWIF(drive)->ide_dma_host_on(drive))
 		return 1;
 
-#ifdef CONFIG_BLK_DEV_IDE_TCQ_DEFAULT
-	HWIF(drive)->ide_dma_queued_on(drive);
-#endif
-
 	return 0;
 }