[Linux-mips-commits]CVS: linux/drivers/pcmcia au1000_pb1x00.c,1.4,1.5

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv8574/drivers/pcmcia

Modified Files:
	au1000_pb1x00.c 
Log Message:
Dual slot bug fix.


Index: au1000_pb1x00.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/au1000_pb1x00.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- au1000_pb1x00.c	1 May 2002 18:00:30 -0000	1.4
+++ au1000_pb1x00.c	18 Jun 2002 20:09:02 -0000	1.5
@@ -313,9 +313,15 @@
 			break;
 	}
 
-	pcr &= ~(PCR_SLOT_0_RST);
-	if (configure->reset) {
-		pcr |= PCR_SLOT_0_RST;
+	if (configure->sock == 0) {
+		pcr &= ~(PCR_SLOT_0_RST);
+		if (configure->reset)
+			pcr |= PCR_SLOT_0_RST;
+	}
+	else {
+		pcr &= ~(PCR_SLOT_1_RST);
+		if (configure->reset)
+			pcr |= PCR_SLOT_1_RST;
 	}
 	au_writel(pcr, PB1000_PCR);
 	au_sync_delay(300);