summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorAlex Harford <aharford@inmotiontechnology.com>2008-06-15 10:34:25 -0700
committerDominik Brodowski <linux@dominikbrodowski.net>2008-06-24 15:33:41 +0200
commit05f43d48ddbda0ce74941aff4711a1829116cc4f (patch)
tree20c3fa1dfe43f4745f32bcdb826fe1b2a5f93aaf /drivers/pcmcia
parentc1ac02280d76de7aba8a9d43638d0f7d1fd0f820 (diff)
downloadlinux-05f43d48ddbda0ce74941aff4711a1829116cc4f.tar.gz
linux-05f43d48ddbda0ce74941aff4711a1829116cc4f.tar.bz2
linux-05f43d48ddbda0ce74941aff4711a1829116cc4f.zip
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>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/ti113x.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/ti113x.h b/drivers/pcmcia/ti113x.h
index 87a5fd5c2127..129db7bd06c3 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;