diff options
Diffstat (limited to 'drivers/ata/sata_qstor.c')
-rw-r--r-- | drivers/ata/sata_qstor.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c index 107ef09814de..2ceb0990bcd8 100644 --- a/drivers/ata/sata_qstor.c +++ b/drivers/ata/sata_qstor.c | |||
@@ -123,6 +123,7 @@ static void qs_bmdma_stop(struct ata_queued_cmd *qc); | |||
123 | static u8 qs_bmdma_status(struct ata_port *ap); | 123 | static u8 qs_bmdma_status(struct ata_port *ap); |
124 | static void qs_freeze(struct ata_port *ap); | 124 | static void qs_freeze(struct ata_port *ap); |
125 | static void qs_thaw(struct ata_port *ap); | 125 | static void qs_thaw(struct ata_port *ap); |
126 | static int qs_prereset(struct ata_link *link, unsigned long deadline); | ||
126 | static void qs_error_handler(struct ata_port *ap); | 127 | static void qs_error_handler(struct ata_port *ap); |
127 | 128 | ||
128 | static struct scsi_host_template qs_ata_sht = { | 129 | static struct scsi_host_template qs_ata_sht = { |
@@ -142,6 +143,8 @@ static struct ata_port_operations qs_ata_ops = { | |||
142 | 143 | ||
143 | .freeze = qs_freeze, | 144 | .freeze = qs_freeze, |
144 | .thaw = qs_thaw, | 145 | .thaw = qs_thaw, |
146 | .prereset = qs_prereset, | ||
147 | .softreset = ATA_OP_NULL, | ||
145 | .error_handler = qs_error_handler, | 148 | .error_handler = qs_error_handler, |
146 | .post_internal_cmd = ATA_OP_NULL, | 149 | .post_internal_cmd = ATA_OP_NULL, |
147 | 150 | ||
@@ -250,8 +253,7 @@ static int qs_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val) | |||
250 | static void qs_error_handler(struct ata_port *ap) | 253 | static void qs_error_handler(struct ata_port *ap) |
251 | { | 254 | { |
252 | qs_enter_reg_mode(ap); | 255 | qs_enter_reg_mode(ap); |
253 | ata_do_eh(ap, qs_prereset, NULL, sata_std_hardreset, | 256 | ata_std_error_handler(ap); |
254 | ata_std_postreset); | ||
255 | } | 257 | } |
256 | 258 | ||
257 | static int qs_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val) | 259 | static int qs_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val) |