From: Daniel Ritz <daniel.ritz@gmx.ch>
To: Silla Rizzoli <silla@netvalley.it>, David Hinds <dhinds@sonic.net>
Cc: linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: 2.4.25 yenta problem and small fix/workaround
Date: Fri, 20 Feb 2004 23:31:44 +0100 [thread overview]
Message-ID: <200402202331.45218.daniel.ritz@gmx.ch> (raw)
silla, does this one help?
dave, what do you think?
rgds
-daniel
patch:
the CB_CDETECT1 and CB_CDETECT2 bits both should be 0 for the card being
recognized correctly (and one of the voltage bits need to be set)
--- 1.15/drivers/pcmcia/yenta.c Tue Jan 6 11:55:05 2004
+++ edited/drivers/pcmcia/yenta.c Fri Feb 20 23:17:54 2004
@@ -135,8 +135,8 @@
val = (state & CB_3VCARD) ? SS_3VCARD : 0;
val |= (state & CB_XVCARD) ? SS_XVCARD : 0;
- val |= (state & (CB_CDETECT1 | CB_CDETECT2 | CB_5VCARD | CB_3VCARD
- | CB_XVCARD | CB_YVCARD)) ? 0 : SS_PENDING;
+ val |= (state & (CB_5VCARD | CB_3VCARD | CB_XVCARD | CB_YVCARD)) ? 0 : SS_PENDING;
+ val |= (state & (CB_CDETECT1 | CB_CDETECT2)) ? SS_PENDING : 0;
if (state & CB_CBCARD) {
val |= SS_CARDBUS;
@@ -677,10 +677,9 @@
/* Redo card voltage interrogation */
state = cb_readl(socket, CB_SOCKET_STATE);
- if (!(state & (CB_CDETECT1 | CB_CDETECT2 | CB_5VCARD |
- CB_3VCARD | CB_XVCARD | CB_YVCARD)))
-
- cb_writel(socket, CB_SOCKET_FORCE, CB_CVSTEST);
+ if (!(state & (CB_5VCARD | CB_3VCARD | CB_XVCARD | CB_YVCARD)) ||
+ (state & (CB_CDETECT1 | CB_CDETECT2)))
+ cb_writel(socket, CB_SOCKET_FORCE, CB_CVSTEST);
}
/* Called at resume and initialization events */
next reply other threads:[~2004-02-20 22:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-02-20 22:31 Daniel Ritz [this message]
2004-02-21 12:28 ` 2.4.25 yenta problem and small fix/workaround Silla Rizzoli
2004-02-21 17:12 ` Daniel Ritz
2004-02-22 16:03 ` Silla Rizzoli
2004-02-22 16:30 ` Russell King
2004-02-22 17:20 ` Silla Rizzoli
-- strict thread matches above, loose matches on Subject: below --
2004-02-19 11:22 Silla Rizzoli
2004-02-19 13:14 ` Marcelo Tosatti
2004-02-19 12:58 ` Silla Rizzoli
2004-02-19 20:32 ` David Hinds
2004-02-20 10:36 ` Silla Rizzoli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200402202331.45218.daniel.ritz@gmx.ch \
--to=daniel.ritz@gmx.ch \
--cc=dhinds@sonic.net \
--cc=linux-kernel@vger.kernel.org \
--cc=silla@netvalley.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox