Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	net/mac80211/mlme.c

1 files changed, 13 insertions, 17 deletions

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 58bdc538d229..c1db2f234d2e 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2040,7 +2040,7 @@ static void ata_eh_link_report(struct ata_link *link)
         }
 
         if (ehc->i.serror)
-                ata_port_printk(ap, KERN_ERR,
+                ata_link_printk(link, KERN_ERR,
                   "SError: { %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s}\n",
                   ehc->i.serror & SERR_DATA_RECOVERED ? "RecovData " : "",
                   ehc->i.serror & SERR_COMM_RECOVERED ? "RecovComm " : "",
@@ -2171,18 +2171,12 @@ static int ata_do_reset(struct ata_link *link, ata_reset_fn_t reset,
 }
 
 static int ata_eh_followup_srst_needed(struct ata_link *link,
-                                       int rc, int classify,
-                                       const unsigned int *classes)
+                                       int rc, const unsigned int *classes)
 {
         if ((link->flags & ATA_LFLAG_NO_SRST) || ata_link_offline(link))
                 return 0;
-        if (rc == -EAGAIN) {
-                if (classify)
-                        return 1;
-                rc = 0;
-        }
-        if (rc != 0)
-                return 0;
+        if (rc == -EAGAIN)
+                return 1;
         if (sata_pmp_supported(link->ap) && ata_is_host_link(link))
                 return 1;
         return 0;
@@ -2210,6 +2204,10 @@ int ata_eh_reset(struct ata_link *link, int classify,
          */
         while (ata_eh_reset_timeouts[max_tries] != ULONG_MAX)
                 max_tries++;
+        if (link->flags & ATA_LFLAG_NO_HRST)
+                hardreset = NULL;
+        if (link->flags & ATA_LFLAG_NO_SRST)
+                softreset = NULL;
 
         now = jiffies;
         deadline = ata_deadline(ehc->last_reset, ATA_EH_RESET_COOL_DOWN);
@@ -2247,10 +2245,10 @@ int ata_eh_reset(struct ata_link *link, int classify,
         ehc->i.action &= ~ATA_EH_RESET;
         if (hardreset) {
                 reset = hardreset;
-                ehc->i.action = ATA_EH_HARDRESET;
+                ehc->i.action |= ATA_EH_HARDRESET;
         } else if (softreset) {
                 reset = softreset;
-                ehc->i.action = ATA_EH_SOFTRESET;
+                ehc->i.action |= ATA_EH_SOFTRESET;
         }
 
         if (prereset) {
@@ -2305,9 +2303,11 @@ int ata_eh_reset(struct ata_link *link, int classify,
                         ehc->i.flags |= ATA_EHI_DID_SOFTRESET;
 
                 rc = ata_do_reset(link, reset, classes, deadline);
+                if (rc && rc != -EAGAIN)
+                        goto fail;
 
                 if (reset == hardreset &&
-                    ata_eh_followup_srst_needed(link, rc, classify, classes)) {
+                    ata_eh_followup_srst_needed(link, rc, classes)) {
                         /* okay, let's do follow-up softreset */
                         reset = softreset;
 
@@ -2322,10 +2322,6 @@ int ata_eh_reset(struct ata_link *link, int classify,
                         ata_eh_about_to_do(link, NULL, ATA_EH_RESET);
                         rc = ata_do_reset(link, reset, classes, deadline);
                 }
-
-                /* -EAGAIN can happen if we skipped followup SRST */
-                if (rc && rc != -EAGAIN)
-                        goto fail;
         } else {
                 if (verbose)
                         ata_link_printk(link, KERN_INFO, "no reset method "