From: Jeff Garzik <jgarzik@pobox.com>
Date: Fri, 27 Jan 2006 07:39:25 +0000 (-0500)
Subject: Merge branch 'tmp'
X-Git-Tag: v2.6.18-rc1~1079^2~98^2~13^2~56
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7103c7bc863c10dd2a26c19c8cf4d7d2846da947;p=karo-tx-linux.git

Merge branch 'tmp'
---

7103c7bc863c10dd2a26c19c8cf4d7d2846da947
diff --cc drivers/scsi/libata-core.c
index 50fb7cea94eb,93ae2dcc837c..c67c7a49c8ba
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@@ -3662,11 -3470,8 +3654,10 @@@ static void ata_qc_timeout(struct ata_q
  		printk(KERN_ERR "ata%u: command 0x%x timeout, stat 0x%x host_stat 0x%x\n",
  		       ap->id, qc->tf.command, drv_stat, host_stat);
  
 +		ap->hsm_task_state = HSM_ST_IDLE;
 +
  		/* complete taskfile transaction */
  		qc->err_mask |= ac_err_mask(drv_stat);
- 		ata_qc_complete(qc);
  		break;
  	}
  
@@@ -4705,7 -4413,9 +4698,8 @@@ static void ata_host_init(struct ata_po
  	ap->active_tag = ATA_TAG_POISON;
  	ap->last_ctl = 0xFF;
  
 -	INIT_WORK(&ap->packet_task, atapi_packet_task, ap);
  	INIT_WORK(&ap->pio_task, ata_pio_task, ap);
+ 	INIT_LIST_HEAD(&ap->eh_done_q);
  
  	for (i = 0; i < ATA_MAX_DEVICES; i++)
  		ap->device[i].devno = i;