summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ata_piix.c
diff options
context:
space:
mode:
authorTejun Heo2006-03-31 13:01:50 +0200
committerJeff Garzik2006-03-31 17:14:41 +0200
commit79ea24e72e59b5f0951483cc4f357afe9bf7ff89 (patch)
tree95f83353bca5d6d27d2b617f77641d9431d680c4 /drivers/scsi/ata_piix.c
parentMerge branch 'master' (diff)
downloadkernel-qcow2-linux-79ea24e72e59b5f0951483cc4f357afe9bf7ff89.tar.gz
kernel-qcow2-linux-79ea24e72e59b5f0951483cc4f357afe9bf7ff89.tar.xz
kernel-qcow2-linux-79ea24e72e59b5f0951483cc4f357afe9bf7ff89.zip
[PATCH] ata_piix: fix ich6/m_map_db
MAP tables of ich6 and ich6m are wrong. Depending on port usage, ata_piix may fail to initialize attached devices. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/scsi/ata_piix.c')
-rw-r--r--drivers/scsi/ata_piix.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 2d5be84d8bd4..24e71b555172 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -301,7 +301,7 @@ static struct piix_map_db ich6_map_db = {
.mask = 0x3,
.map = {
/* PM PS SM SS MAP */
- { P0, P1, P2, P3 }, /* 00b */
+ { P0, P2, P1, P3 }, /* 00b */
{ IDE, IDE, P1, P3 }, /* 01b */
{ P0, P2, IDE, IDE }, /* 10b */
{ RV, RV, RV, RV },
@@ -312,7 +312,7 @@ static struct piix_map_db ich6m_map_db = {
.mask = 0x3,
.map = {
/* PM PS SM SS MAP */
- { P0, P1, P2, P3 }, /* 00b */
+ { P0, P2, RV, RV }, /* 00b */
{ RV, RV, RV, RV },
{ P0, P2, IDE, IDE }, /* 10b */
{ RV, RV, RV, RV },