libata: Fix EH merge difference between this branch and upstream.

[linux-2.6] / drivers / scsi / libata-eh.c

diff --git a/drivers/scsi/libata-eh.c b/drivers/scsi/libata-eh.c
index e73f5612aea8f355d60eaced846307875c7e74f4..b518654b9d6027c4ea8cebe8049c4c40074baaec 100644 (file)
--- 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)
  *     RETURNS:
  *     Zero.
  */
-int ata_scsi_error(struct Scsi_Host *host)
+void ata_scsi_error(struct Scsi_Host *host)
 {
        struct ata_port *ap = (struct ata_port *)&host->hostdata[0];
 
@@ -116,7 +116,6 @@ int ata_scsi_error(struct Scsi_Host *host)
        scsi_eh_flush_done_q(&ap->eh_done_q);
 
        DPRINTK("EXIT\n");
-       return 0;
 }
 
 /**