Re: Patch(?) to make

Armin Schindler (mac@melware.de)
Fri, 12 Nov 1999 14:41:21 +0100


At 03:20 12.11.99 -0800, Adam J. Richter wrote:
>
> linux-2.3.27/drivers/isdn/eicon/eicon_mod.c does not compile
>because it includes some calls to eicon_log that pass a parameter
>"card", which is not defined. Changing the calls to printk's makes
>the module compile, although I have not investigated why there is a
>separate logging facility for a single device driver module.

Thanx, the problem only appears if CONFIG_MCA is set.

eicon_log() itself calls wether printk() or fills a status
buffer for logging via char device of i4l depending on user
specification.

The fix looks like this:
---------------------CUT HERE--------------------------------------------
Index: drivers/isdn/eicon/eicon_mod.c
===================================================================
RCS file:
/usr/src.repository/repository/linux-2.3/drivers/isdn/eicon/eicon_mod.c,v
retrieving revision 1.1.1.6
diff -u -r1.1.1.6 eicon_mod.c
--- eicon_mod.c 1999/11/11 17:45:00 1.1.1.6
+++ eicon_mod.c 1999/11/12 10:21:45
@@ -1382,7 +1382,7 @@
printk(KERN_INFO
"eicon: No MCA bus, ISDN-interfaces not probed.\n");
} else {
- eicon_log(card, 8,
+ eicon_log(NULL, 8,
"eicon_mca_find_card, irq=%d.\n",
irq);
if (!eicon_mca_find_card(0, membase, irq, id))
@@ -1511,7 +1511,7 @@
{
int j, curr_slot = 0;

- eicon_log(card, 8,
+ eicon_log(NULL, 8,
"eicon_mca_find_card type: %d, membase: %#x, irq %d \n",
type, membase, irq);
/* find a no-driver-assigned eicon card */
@@ -1578,7 +1578,7 @@
int irq_array1[]={3,4,0,0,2,10,11,12};

adf_pos0 = mca_read_stored_pos(slot,2);
- eicon_log(card, 8,
+ eicon_log(NULL, 8,
"eicon_mca_probe irq=%d, membase=%d\n",
irq,
membase);
@@ -1649,7 +1649,7 @@
/* reset card */
outb_p(0,cards_io+1);

- eicon_log(card, 8, "eicon_addcard: successful for slot # %d.\n",
+ eicon_log(NULL, 8, "eicon_addcard: successful for slot # %d.\n",
cards->mca_slot+1);
return 0 ; /* eicon_addcard hat eine Karte zugefuegt */
} else {

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/