aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libata-eh.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-11 13:04:39 -0400
committerJeff Garzik <jeff@garzik.org>2006-04-11 13:04:39 -0400
commit381544bba3ae6f2f1004b267da34f840b469033c (patch)
treee748d5da19d3fa79bee2ad5b40b44722cdf64184 /drivers/scsi/libata-eh.c
parent10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1 (diff)
libata: Fix EH merge difference between this branch and upstream.
Diffstat (limited to 'drivers/scsi/libata-eh.c')
-rw-r--r--drivers/scsi/libata-eh.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/libata-eh.c b/drivers/scsi/libata-eh.c
index e73f5612aea8..b518654b9d60 100644
--- a/drivers/scsi/libata-eh.c
+++ b/drivers/scsi/libata-eh.c
@@ -97,7 +97,7 @@ enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd)
97 * RETURNS: 97 * RETURNS:
98 * Zero. 98 * Zero.
99 */ 99 */
100int ata_scsi_error(struct Scsi_Host *host) 100void ata_scsi_error(struct Scsi_Host *host)
101{ 101{
102 struct ata_port *ap = (struct ata_port *)&host->hostdata[0]; 102 struct ata_port *ap = (struct ata_port *)&host->hostdata[0];
103 103
@@ -116,7 +116,6 @@ int ata_scsi_error(struct Scsi_Host *host)
116 scsi_eh_flush_done_q(&ap->eh_done_q); 116 scsi_eh_flush_done_q(&ap->eh_done_q);
117 117
118 DPRINTK("EXIT\n"); 118 DPRINTK("EXIT\n");
119 return 0;
120} 119}
121 120
122/** 121/**