Index: isdn_common.c
===================================================================
RCS file: /cvs/pasta/os/linux-fiori/drivers/isdn/i4l/isdn_common.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C 2 -d -r1.1.1.1 -r1.2
*** isdn_common.c	10 Jan 2007 20:25:09 -0000	1.1.1.1
--- isdn_common.c	12 Jul 2007 20:19:43 -0000	1.2
***************
*** 830,834 ****
  			}
  			count_put = count_pull;
! 			memcpy(cp, skb->data, count_put);
  			cp += count_put;
  			len -= count_put;
--- 830,834 ----
  			}
  			count_put = count_pull;
! 			skb_copy_from_linear_data(skb, cp, count_put);
  			cp += count_put;
  			len -= count_put;
***************
*** 1060,1064 ****
  isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
  {
! 	uint minor = iminor(file->f_dentry->d_inode);
  	int len = 0;
  	int drvidx;
--- 1060,1064 ----
  isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
  {
! 	uint minor = iminor(file->f_path.dentry->d_inode);
  	int len = 0;
  	int drvidx;
***************
*** 1167,1171 ****
  isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off)
  {
! 	uint minor = iminor(file->f_dentry->d_inode);
  	int drvidx;
  	int chidx;
--- 1167,1171 ----
  isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off)
  {
! 	uint minor = iminor(file->f_path.dentry->d_inode);
  	int drvidx;
  	int chidx;
***************
*** 1229,1233 ****
  {
  	unsigned int mask = 0;
! 	unsigned int minor = iminor(file->f_dentry->d_inode);
  	int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL);
  
--- 1229,1233 ----
  {
  	unsigned int mask = 0;
! 	unsigned int minor = iminor(file->f_path.dentry->d_inode);
  	int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL);
  
***************
*** 1823,1827 ****
  }
  
! static struct file_operations isdn_fops =
  {
  	.owner		= THIS_MODULE,
--- 1823,1827 ----
  }
  
! static const struct file_operations isdn_fops =
  {
  	.owner		= THIS_MODULE,
***************
*** 2073,2085 ****
  	if ((adding) && (d->rcverr))
  		kfree(d->rcverr);
! 	if (!(d->rcverr = kmalloc(sizeof(int) * m, GFP_ATOMIC))) {
  		printk(KERN_WARNING "register_isdn: Could not alloc rcverr\n");
  		return -1;
  	}
- 	memset((char *) d->rcverr, 0, sizeof(int) * m);
  
  	if ((adding) && (d->rcvcount))
  		kfree(d->rcvcount);
! 	if (!(d->rcvcount = kmalloc(sizeof(int) * m, GFP_ATOMIC))) {
  		printk(KERN_WARNING "register_isdn: Could not alloc rcvcount\n");
  		if (!adding)
--- 2073,2084 ----
  	if ((adding) && (d->rcverr))
  		kfree(d->rcverr);
! 	if (!(d->rcverr = kzalloc(sizeof(int) * m, GFP_ATOMIC))) {
  		printk(KERN_WARNING "register_isdn: Could not alloc rcverr\n");
  		return -1;
  	}
  
  	if ((adding) && (d->rcvcount))
  		kfree(d->rcvcount);
! 	if (!(d->rcvcount = kzalloc(sizeof(int) * m, GFP_ATOMIC))) {
  		printk(KERN_WARNING "register_isdn: Could not alloc rcvcount\n");
  		if (!adding)
***************
*** 2087,2091 ****
  		return -1;
  	}
- 	memset((char *) d->rcvcount, 0, sizeof(int) * m);
  
  	if ((adding) && (d->rpqueue)) {
--- 2086,2089 ----
***************
*** 2227,2235 ****
  		return 0;
  	}
! 	if (!(d = kmalloc(sizeof(isdn_driver_t), GFP_KERNEL))) {
  		printk(KERN_WARNING "register_isdn: Could not alloc driver-struct\n");
  		return 0;
  	}
- 	memset((char *) d, 0, sizeof(isdn_driver_t));
  
  	d->maxbufsize = i->maxbufsize;
--- 2225,2232 ----
  		return 0;
  	}
! 	if (!(d = kzalloc(sizeof(isdn_driver_t), GFP_KERNEL))) {
  		printk(KERN_WARNING "register_isdn: Could not alloc driver-struct\n");
  		return 0;
  	}
  
  	d->maxbufsize = i->maxbufsize;