Messages in this thread Patch in this message |  | | Date | Tue, 19 Sep 2000 00:23:51 +1100 | From | Andrew Morton <> | Subject | Re: [patch] Card services & yenta driver |
| |
This one...
- Fix some warnings which resulted from turning off debug in cardbus.c
- sleep for the correct duration after taking the reset away (this was left over from some testing. Sorry).
--- linux-2.4.0-test9-pre2/drivers/pcmcia/cardbus.c Mon Sep 18 20:31:49 2000 +++ linux-akpm/drivers/pcmcia/cardbus.c Tue Sep 19 00:08:23 2000 @@ -68,10 +68,9 @@ #include "cs_internal.h" #include "rsrc_mgr.h" -#ifndef PCMCIA_DEBUG -#define PCMCIA_DEBUG 1 -#endif +#ifdef PCMCIA_DEBUG static int pc_debug = PCMCIA_DEBUG; +#endif /*====================================================================*/ @@ -372,9 +371,9 @@ void cb_enable(socket_info_t * s) { struct pci_dev *dev; - u_char i, bus = s->cap.cb_dev->subordinate->number; + u_char i; - DEBUG(0, "cs: cb_enable(bus %d)\n", bus); + DEBUG(0, "cs: cb_enable(bus %d)\n", s->cap.cb_dev->subordinate->number); /* Configure bridge */ cb_release_cis_mem(s); --- linux-2.4.0-test9-pre2/drivers/pcmcia/cs.c Mon Sep 18 20:31:49 2000 +++ linux-akpm/drivers/pcmcia/cs.c Tue Sep 19 00:08:33 2000 @@ -564,7 +564,7 @@ udelay((long)reset_time); s->socket.flags &= ~SS_RESET; set_socket(s, &s->socket); - cs_sleep(unreset_delay/10); + cs_sleep(unreset_delay); unreset_socket(s); } /* reset_socket */ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org Please read the FAQ at http://www.tux.org/lkml/
|  |