Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / drivers / isdn / i4l / isdn_common.c

diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 6a2ef0a87ed9a5143ba61a396cd35bdfd4908f68..ec5f4046412fa564644619175c59373ab4ca39e3 100644 (file)
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -829,7 +829,7 @@ isdn_readbchan(int di, int channel, u_char * buf, u_char * fp, int len, wait_que
                                dflag = 0;
                        }
                        count_put = count_pull;
-                       memcpy(cp, skb->data, count_put);
+                       skb_copy_from_linear_data(skb, cp, count_put);
                        cp += count_put;
                        len -= count_put;
 #ifdef CONFIG_ISDN_AUDIO
@@ -1822,7 +1822,7 @@ isdn_close(struct inode *ino, struct file *filep)
        return 0;
 }
 
-static struct file_operations isdn_fops =
+static const struct file_operations isdn_fops =
 {
        .owner          = THIS_MODULE,
        .llseek         = no_llseek,
@@ -2291,7 +2291,7 @@ static int __init isdn_init(void)
        int i;
        char tmprev[50];
 
-       if (!(dev = (isdn_dev *) vmalloc(sizeof(isdn_dev)))) {
+       if (!(dev = vmalloc(sizeof(isdn_dev)))) {
                printk(KERN_WARNING "isdn: Could not allocate device-struct.\n");
                return -EIO;
        }