Ubuntu
sl-modem package

  1. Bug #737650
  2. Comment #13

Comment 13 for bug 737650

Revision history for this message
Harald Jenny (harald-a-little-linux-box) wrote : Re: sl-modem-source: sl-modem fails to compile with kernel 2.6.37-1-686

Hi

On Sun, Mar 20, 2011 at 08:23:53AM +0200, ???????? ???????????????? wrote:
> On Sat, Mar 19, 2011 at 10:01:19PM +0100, Harald Jenny wrote:
> > Seems like the arguments have changed, please see attached log.
> ---end quoted text---
>
> Thanks, please try the attached patch instead.

Problem with 2.6.37 is fixed by this patch (and module also compiles with
2.6.38).

Thanks for your help and kind regards
Harald Jenny

>
> --
> ??????????? ???????????????? (Ahmed El-Mahmoudy)
> Digital design engineer
> GPG KeyID: 0xEDDDA1B7
> GPG Fingerprint: 8206 A196 2084 7E6D 0DF8 B176 BC19 6A94 EDDD A1B7

> Description: Fix compilation of slusb with 2.6.37
> *_MUTEX got deprecated since kernel 2.6.37
> Author: ???????? ???????????????? (Ahmed El-Mahmoudy) <email address hidden>
> Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=613906
> Bug-Ubuntu: https://bugs.launchpad.net/bugs/737650
> --- a/drivers/st7554.c
> +++ b/drivers/st7554.c
> @@ -233,7 +233,11 @@
> static struct class *st7554_class;
> #endif
>
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
> static DECLARE_MUTEX(open_sem);
> +#else
> +static DEFINE_SEMAPHORE(open_sem);
> +#endif
>
> /* --------------------------------------------------------------------- */
>
> @@ -1234,7 +1238,11 @@
> memset(s, 0, sizeof(*s));
>
> spin_lock_init(&s->lock);
> +#ifdef init_MUTEX
> init_MUTEX (&s->sem);
> +#else
> + sema_init (&s->sem, 1);
> +#endif
> init_waitqueue_head(&s->wait);
>
> s->name = "ST7554 USB Modem";