diff --git a/[refs] b/[refs]
index 46b2e9447980..9aa546889d46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5387373bfe78b7795b96378250f6848f39d78b80
+refs/heads/master: 61f216c7196e15e56d97c5a75af01e6684f17fa3
diff --git a/trunk/include/linux/ata.h b/trunk/include/linux/ata.h
index 18e401ff7eaf..272736e37990 100644
--- a/trunk/include/linux/ata.h
+++ b/trunk/include/linux/ata.h
@@ -352,7 +352,7 @@ static inline int ata_drive_40wire(const u16 *dev_id)
 {
 	if (ata_id_major_version(dev_id) >= 5 && ata_id_is_sata(dev_id))
 		return 0;	/* SATA */
-	if (dev_id[93] & 0x4000)
+	if ((dev_id[93] & 0xE000) == 0x6000)
 		return 0;	/* 80 wire */
 	return 1;
 }