Commit e378168a authored by Jens Axboe's avatar Jens Axboe Committed by Linus Torvalds

[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.
parent 2d691920
......@@ -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)
......
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment