Merge master.kernel.org:/home/rmk/linux-2.6-arm

[mv-sheeva.git] / drivers / ata / libata-eh.c

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 228740f356c961ef3768411a349d146a950c3c4f..f77a67303f8b3d0d724e4fccd3510a269a72b0c8 100644 (file)
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -550,8 +550,8 @@ void ata_scsi_error(struct Scsi_Host *host)
 
        DPRINTK("ENTER\n");
 
-       /* synchronize with port task */
-       ata_port_flush_task(ap);
+       /* make sure sff pio task is not running */
+       ata_sff_flush_pio_task(ap);
 
        /* synchronize with host lock and sort out timeouts */
 
@@ -3684,7 +3684,7 @@ void ata_std_error_handler(struct ata_port *ap)
        ata_reset_fn_t hardreset = ops->hardreset;
 
        /* ignore built-in hardreset if SCR access is not available */
-       if (ata_is_builtin_hardreset(hardreset) && !sata_scr_valid(&ap->link))
+       if (hardreset == sata_std_hardreset && !sata_scr_valid(&ap->link))
                hardreset = NULL;
 
        ata_do_eh(ap, ops->prereset, ops->softreset, hardreset, ops->postreset);