diff --git a/[refs] b/[refs]
index 43ad62896876..e58934934d4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0af80c04e2f2e45ae09fceb17df8050f828a5c40
+refs/heads/master: 43a12216d3664a9fa6c8ceb398da6ef08fee7ff7
diff --git a/trunk/drivers/ide/amd74xx.c b/trunk/drivers/ide/amd74xx.c
index 69660a431cd9..77267c859965 100644
--- a/trunk/drivers/ide/amd74xx.c
+++ b/trunk/drivers/ide/amd74xx.c
@@ -166,7 +166,7 @@ static unsigned int init_chipset_amd74xx(struct pci_dev *dev)
 	 * Check for broken FIFO support.
 	 */
 	if (dev->vendor == PCI_VENDOR_ID_AMD &&
-	    dev->vendor == PCI_DEVICE_ID_AMD_VIPER_7411)
+	    dev->device == PCI_DEVICE_ID_AMD_VIPER_7411)
 		t &= 0x0f;
 	else
 		t |= 0xf0;