---

yaml --- r: 29377 b: refs/heads/master c: 41232d3 h: refs/heads/master i: 29375: 53a0d58 v: v3
git-mirror · Feb 9, 2006 · 49377c3 · 49377c3
1 parent 439dc7c
commit 49377c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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);