public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Brad Campbell <brad@wasp.net.au>
To: linux-kernel@vger.kernel.org
Cc: dahinds@users.sourceforge.net, marcelo.tosatti@cyclades.com
Subject: [patch] 2.4.x yenta.c
Date: Tue, 30 Dec 2003 17:58:07 +0400	[thread overview]
Message-ID: <3FF1846F.40607@wasp.net.au> (raw)

This fixes a longstanding bug on my OZ6933 Cardbus Controller (rev 01)
(Having to insert a card twice to get it to come up)

I snarfed it from a 2.6-pre and applied it to 2.4. Could it be applied 
to 2.4.24 pretty please ?


diff -urN linux-2.4.23/drivers/pcmcia/yenta.c 
linux-2.4.23.olf/drivers/pcmcia/yenta.c
--- linux-2.4.23/drivers/pcmcia/yenta.c 2003-12-30 21:08:09.000000000 +0400
+++ linux-2.4.23.olf/drivers/pcmcia/yenta.c     2003-12-12 
20:50:58.000000000 +0400
@@ -634,6 +634,7 @@
   */
  static void yenta_config_init(pci_socket_t *socket)
  {
+       u32 state;
         u16 bridge;
         struct pci_dev *dev = socket->dev;

@@ -673,6 +674,10 @@
         exca_writeb(socket, I365_GENCTL, 0x00);

         /* 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);
  }

Regards,
Brad

                 reply	other threads:[~2003-12-30 13:58 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=3FF1846F.40607@wasp.net.au \
    --to=brad@wasp.net.au \
    --cc=dahinds@users.sourceforge.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marcelo.tosatti@cyclades.com \
    /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