From 49377c3a3e3ca7f834a13f1cad923d7d63d76e42 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Thu, 9 Feb 2006 04:52:55 -0500 Subject: [PATCH] --- yaml --- r: 29377 b: refs/heads/master c: 41232d3ecac9df8eb94ff27330eb84b8baccc6b7 h: refs/heads/master i: 29375: 53a0d5885d46fde7511d5319eff94cc62cd633a7 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-core.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8649fb696bc8..64606e34427d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ddd1023d2ccde0b330338c48ab898b153f37712 +refs/heads/master: 41232d3ecac9df8eb94ff27330eb84b8baccc6b7 diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c index c93bb1bd3332..59d8dd025107 100644 --- a/trunk/drivers/scsi/libata-core.c +++ b/trunk/drivers/scsi/libata-core.c @@ -1087,10 +1087,10 @@ ata_queue_delayed_pio_task(struct ata_port *ap, unsigned long delay) } /** - * ata_flush_pio_tasks - Flush pio_task and packet_task + * ata_flush_pio_tasks - Flush pio_task * @ap: the target ata_port * - * After this function completes, pio_task and packet_task are + * After this function completes, pio_task is * guranteed not to be running or scheduled. * * LOCKING: @@ -1117,7 +1117,6 @@ static void ata_flush_pio_tasks(struct ata_port *ap) * Cancel and flush. */ tmp |= cancel_delayed_work(&ap->pio_task); - tmp |= cancel_delayed_work(&ap->packet_task); if (!tmp) { DPRINTK("flush #2\n"); flush_workqueue(ata_wq);