diff options
| author | Tejun Heo <htejun@gmail.com> | 2008-01-03 16:22:19 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2008-01-10 22:52:41 +0100 |
| commit | b14dabcdb651ddd9f85c69c9042322c139e7da84 (patch) | |
| tree | c711c530196b5ac7ebdec7d475a06e41466e480f /drivers/ata/sata_qstor.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-b14dabcdb651ddd9f85c69c9042322c139e7da84.tar.xz linux-b14dabcdb651ddd9f85c69c9042322c139e7da84.zip | |
sata_qstor: use hardreset instead of softreset
During conversion to new EH, sata_qstor was accidentaly changed to use
softreset, which is buggy on this chip, instead of hardreset. This
patch updates sata_qstor such that it uses hardreset again.
This fixes bugzilla bug 9631.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Mark Lord <mlord@pobox.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/sata_qstor.c')
| -rw-r--r-- | drivers/ata/sata_qstor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c index 2f1de6ec044c..c68b241805fd 100644 --- a/drivers/ata/sata_qstor.c +++ b/drivers/ata/sata_qstor.c @@ -270,7 +270,7 @@ static int qs_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val) static void qs_error_handler(struct ata_port *ap) { qs_enter_reg_mode(ap); - ata_do_eh(ap, qs_prereset, ata_std_softreset, NULL, + ata_do_eh(ap, qs_prereset, NULL, sata_std_hardreset, ata_std_postreset); } |