From 36f1adf9284b6cdcdb068af789a0c6af04c02d95 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jgarzik@pobox.com>
Date: Sat, 28 Jan 2006 12:26:23 -0500
Subject: [PATCH] --- yaml --- r: 21803 b: refs/heads/master c:
 b376bc1f6b4258112d714fb4ee8e5d57b53625f2 h: refs/heads/master i:   21801:
 cbfd041708bca5f534ff66a5c655d0735b2f53b2   21799:
 f469cd76b56132ddb5c456c7f76bd4ea0e2c1426 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/scsi/ata_piix.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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: