Re: Linux 2.6.9-rc3

Marcel Holtmann
2004-09-30T05:15:41Z

[-- Attachment #1: Type: text/plain, Size: 1113 bytes --]

Hi Tom,

> > Ok, this 2.6.9 cycle is getting too long, but here's a -rc3 and hopefully
> > we're getting there now.
>
> CC [M] drivers/isdn/capi/capi.o
> /build1/tduffy/linux-2.6.9-rc3/drivers/isdn/capi/capi.c: In function
> `handle_minor_send':
> /build1/tduffy/linux-2.6.9-rc3/drivers/isdn/capi/capi.c:538:
> warning: cast from pointer to integer of different size
> /build1/tduffy/linux-2.6.9-rc3/drivers/isdn/capi/capi.c: In function
> `capi_recv_message':
> /build1/tduffy/linux-2.6.9-rc3/drivers/isdn/capi/capi.c:649:
> error: `tty' undeclared (first use in this function)
> /build1/tduffy/linux-2.6.9-rc3/drivers/isdn/capi/capi.c:649:
> error: (Each undeclared identifier is reported only once
> /build1/tduffy/linux-2.6.9-rc3/drivers/isdn/capi/capi.c:649:
> error: for each function it appears in.)
> make[4]: *** [drivers/isdn/capi/capi.o] Error 1
> make[3]: *** [drivers/isdn/capi] Error 2
> make[2]: *** [drivers/isdn] Error 2
> make[1]: *** [drivers] Error 2
> make: *** [_all] Error 2

the attached patch should fix it.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

Regards

Marcel

[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 864 bytes --]

===== drivers/isdn/capi/capi.c 1.59 vs edited =====
--- 1.59/drivers/isdn/capi/capi.c 2004-09-29 17:03:13 +02:00
+++ edited/drivers/isdn/capi/capi.c 2004-09-30 00:57:58 +02:00
@@ -646,7 +650,7 @@
kfree_skb(skb);
(void)capiminor_del_ack(mp, datahandle);
if (mp->tty)
- tty_wakeup(tty);
+ tty_wakeup(mp->tty);
(void)handle_minor_send(mp);

} else {
===== drivers/isdn/i4l/isdn_tty.c 1.60 vs edited =====
--- 1.60/drivers/isdn/i4l/isdn_tty.c 2004-09-29 17:02:20 +02:00
+++ edited/drivers/isdn/i4l/isdn_tty.c 2004-09-30 00:59:48 +02:00
@@ -2673,7 +2673,7 @@
if ((info->flags & ISDN_ASYNC_CLOSING) || (!info->tty)) {
return;
}
- tty_ldisc_flush(tty);
+ tty_ldisc_flush(info->tty);
if ((info->flags & ISDN_ASYNC_CHECK_CD) &&
(!((info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) &&
(info->flags & ISDN_ASYNC_CALLOUT_NOHUP)))) {