diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-11 13:04:39 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-11 13:04:39 -0400 |
| commit | 381544bba3ae6f2f1004b267da34f840b469033c (patch) | |
| tree | e748d5da19d3fa79bee2ad5b40b44722cdf64184 /drivers/scsi | |
| parent | 10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1 (diff) | |
libata: Fix EH merge difference between this branch and upstream.
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/libata-eh.c | 3 | ||||
| -rw-r--r-- | drivers/scsi/libata.h | 1 |
2 files changed, 2 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) * 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; } /** diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h index 652c08e3808e..b18d377588dc 100644 --- a/drivers/scsi/libata.h +++ b/drivers/scsi/libata.h @@ -105,5 +105,6 @@ extern void ata_scsi_rbuf_fill(struct ata_scsi_args *args, /* libata-eh.c */ extern enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd); +extern void ata_scsi_error(struct Scsi_Host *host); #endif /* __LIBATA_H__ */ |