diff --git a/[refs] b/[refs]
index 641813c1b090..ed000075727c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2bd58047b9b5c91a3b0a851de66a877f2eb7ae3
+refs/heads/master: b376bc1f6b4258112d714fb4ee8e5d57b53625f2
diff --git a/trunk/drivers/scsi/ata_piix.c b/trunk/drivers/scsi/ata_piix.c
index 19d8d4ba6a1e..2d984b090b23 100644
--- a/trunk/drivers/scsi/ata_piix.c
+++ b/trunk/drivers/scsi/ata_piix.c
@@ -713,7 +713,7 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 		pci_read_config_byte(pdev, ICH5_PMR, &tmp);
 
 		if (host_flags & PIIX_FLAG_COMBINED_ICH6) {
-			switch (tmp) {
+			switch (tmp & 0x3) {
 			case 0:
 				break;
 			case 1: