Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] revert new check-ready Status register logic

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 7e206da1fbfb4e88807b0609bdb814b38d247ebe..0f17643e0a6e06c6942ceba10017b99c12674027 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1384,17 +1384,14 @@ static inline struct ata_port *ata_shost_to_port(struct Scsi_Host *host)
 
 static inline int ata_check_ready(u8 status)
 {
-       /* Some controllers report 0x77 or 0x7f during intermediate
-        * not-ready stages.
-        */
-       if (status == 0x77 || status == 0x7f)
-               return 0;
+       if (!(status & ATA_BUSY))
+               return 1;
 
        /* 0xff indicates either no device or device not ready */
        if (status == 0xff)
                return -ENODEV;
 
-       return !(status & ATA_BUSY);
+       return 0;
 }