From: Alex Harford <aharford@inmotiontechnology.com>
Date: Sun, 15 Jun 2008 17:34:25 +0000 (-0700)
Subject: pcmcia: Fix ti12xx_2nd_slot_empty always failing
X-Git-Tag: v2.6.27-rc1~1113^2~11
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=05f43d48ddbda0ce74941aff4711a1829116cc4f;p=linux-2.6-omap-h63xx.git

pcmcia: Fix ti12xx_2nd_slot_empty always failing

For TI 1520 and others, ti12xx_2nd_slot_empty was reading card detect from
the wrong slot, and always failing.

Signed-off-by: Alex Harford <alex.harford@inmotiontechnology.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---

diff --git a/drivers/pcmcia/ti113x.h b/drivers/pcmcia/ti113x.h
index 87a5fd5c212..129db7bd06c 100644
--- a/drivers/pcmcia/ti113x.h
+++ b/drivers/pcmcia/ti113x.h
@@ -692,7 +692,7 @@ static int ti12xx_2nd_slot_empty(struct yenta_socket *socket)
 		goto out;
 
 	/* check state */
-	yenta_get_status(&socket->socket, &state);
+	yenta_get_status(&slot2->socket, &state);
 	if (state & SS_DETECT) {
 		ret = 0;
 		goto out;