aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-09 04:52:55 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-02-09 04:52:55 -0500
commit41232d3ecac9df8eb94ff27330eb84b8baccc6b7 (patch)
treee10e3b23dbb12c021270c8026c52abc7d0fe14c0 /drivers
parent2ddd1023d2ccde0b330338c48ab898b153f37712 (diff)
[libata] build fix after merging some pre-packet_task-removal code
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/libata-core.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index c93bb1bd33..59d8dd0251 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1087,10 +1087,10 @@ ata_queue_delayed_pio_task(struct ata_port *ap, unsigned long delay)
1087} 1087}
1088 1088
1089/** 1089/**
1090 * ata_flush_pio_tasks - Flush pio_task and packet_task 1090 * ata_flush_pio_tasks - Flush pio_task
1091 * @ap: the target ata_port 1091 * @ap: the target ata_port
1092 * 1092 *
1093 * After this function completes, pio_task and packet_task are 1093 * After this function completes, pio_task is
1094 * guranteed not to be running or scheduled. 1094 * guranteed not to be running or scheduled.
1095 * 1095 *
1096 * LOCKING: 1096 * LOCKING:
@@ -1117,7 +1117,6 @@ static void ata_flush_pio_tasks(struct ata_port *ap)
1117 * Cancel and flush. 1117 * Cancel and flush.
1118 */ 1118 */
1119 tmp |= cancel_delayed_work(&ap->pio_task); 1119 tmp |= cancel_delayed_work(&ap->pio_task);
1120 tmp |= cancel_delayed_work(&ap->packet_task);
1121 if (!tmp) { 1120 if (!tmp) {
1122 DPRINTK("flush #2\n"); 1121 DPRINTK("flush #2\n");
1123 flush_workqueue(ata_wq); 1122 flush_workqueue(ata_wq);