]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
libata-link: update ata_scsi_error() to handle PMP links
authorTejun Heo <htejun@gmail.com>
Mon, 6 Aug 2007 09:36:23 +0000 (18:36 +0900)
committerJeff Garzik <jeff@garzik.org>
Fri, 12 Oct 2007 18:55:32 +0000 (14:55 -0400)
Update ata_scsi_error() to handle PMP links.  As error conditions can
occur on both host and PMP links, __ata_port_for_each_link() is used.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/ata/libata-eh.c

index eb4c0593b406e6e7e10b09d40c8fbbbd69b2042e..45eb932c3935fa233ce556b4733b9a0c27b09e53 100644 (file)
@@ -363,6 +363,8 @@ void ata_scsi_error(struct Scsi_Host *host)
  repeat:
        /* invoke error handler */
        if (ap->ops->error_handler) {
+               struct ata_link *link;
+
                /* kill fast drain timer */
                del_timer_sync(&ap->fastdrain_timer);
 
@@ -372,9 +374,11 @@ void ata_scsi_error(struct Scsi_Host *host)
                /* fetch & clear EH info */
                spin_lock_irqsave(ap->lock, flags);
 
-               memset(&ap->link.eh_context, 0, sizeof(ap->link.eh_context));
-               ap->link.eh_context.i = ap->link.eh_info;
-               memset(&ap->link.eh_info, 0, sizeof(ap->link.eh_info));
+               __ata_port_for_each_link(link, ap) {
+                       memset(&link->eh_context, 0, sizeof(link->eh_context));
+                       link->eh_context.i = link->eh_info;
+                       memset(&link->eh_info, 0, sizeof(link->eh_info));
+               }
 
                ap->pflags |= ATA_PFLAG_EH_IN_PROGRESS;
                ap->pflags &= ~ATA_PFLAG_EH_PENDING;
@@ -410,7 +414,8 @@ void ata_scsi_error(struct Scsi_Host *host)
                }
 
                /* this run is complete, make sure EH info is clear */
-               memset(&ap->link.eh_info, 0, sizeof(ap->link.eh_info));
+               __ata_port_for_each_link(link, ap)
+                       memset(&link->eh_info, 0, sizeof(link->eh_info));
 
                /* Clear host_eh_scheduled while holding ap->lock such
                 * that if exception occurs after this point but