Bug#613906: sl-modem-source: sl-modem fails to compile with kernel 2.6.37-1-686

[أحمد المحمودي]

Hello,

On Fri, Feb 18, 2011 at 08:31:53AM +0100, Harald Jenny wrote:
> make modules -C /lib/modules/2.6.37-1-686/build 
> SUBDIRS=/var/lib/dkms/sl-modem/2.9.11~20100718/build/drivers
> make[2]: Entering directory `/usr/src/linux-headers-2.6.37-1-686'
>   CC [M]  /var/lib/dkms/sl-modem/2.9.11~20100718/build/drivers/amrmo_init.o
> /var/lib/dkms/sl-modem/2.9.11~20100718/build/drivers/amrmo_init.c: In 
> function 'amrmo_ioctl':
> /var/lib/dkms/sl-modem/2.9.11~20100718/build/drivers/amrmo_init.c:450: 
> warning: ignoring return value of 'copy_from_user', declared with attribute 
> warn_unused_result
> /var/lib/dkms/sl-modem/2.9.11~20100718/build/drivers/amrmo_init.c: At top 
> level:
> /var/lib/dkms/sl-modem/2.9.11~20100718/build/drivers/amrmo_init.c:517: error: 
> unknown field 'ioctl' specified in initializer
> /var/lib/dkms/sl-modem/2.9.11~20100718/build/drivers/amrmo_init.c:517: 
> warning: initialization from incompatible pointer type
> make[5]: *** 
> [/var/lib/dkms/sl-modem/2.9.11~20100718/build/drivers/amrmo_init.o] Error 1
---end quoted text---

  Could you try the attached patch please.

-- 
 ‎أحمد المحمودي (Ahmed El-Mahmoudy)
  Digital design engineer
 GPG KeyID: 0xEDDDA1B7
 GPG Fingerprint: 8206 A196 2084 7E6D 0DF8  B176 BC19 6A94 EDDD A1B7

diff --git a/drivers/amrmo_init.c b/drivers/amrmo_init.c
index 98a74a3..d738f71 100644
--- a/drivers/amrmo_init.c
+++ b/drivers/amrmo_init.c
@@ -514,7 +514,7 @@ static struct file_operations amrmo_fops = {
         .read =    amrmo_read,
         .write =   amrmo_write,
         .poll =    amrmo_poll,
-        .ioctl =   amrmo_ioctl,
+        .unlocked_ioctl =   amrmo_ioctl,
         .open =    amrmo_open,
         .release = amrmo_release,
 };

signature.asc
Description: Digital signature