git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
isdn
/
i4l
/
isdn_common.c
diff --git
a/drivers/isdn/i4l/isdn_common.c
b/drivers/isdn/i4l/isdn_common.c
index
69aee26
..
6a2ef0a
100644
(file)
--- a/
drivers/isdn/i4l/isdn_common.c
+++ b/
drivers/isdn/i4l/isdn_common.c
@@
-1059,7
+1059,7
@@
isdn_info_update(void)
static ssize_t
isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
{
static ssize_t
isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
{
- uint minor = iminor(file->f_dentry->d_inode);
+ uint minor = iminor(file->f_
path.
dentry->d_inode);
int len = 0;
int drvidx;
int chidx;
int len = 0;
int drvidx;
int chidx;
@@
-1166,7
+1166,7
@@
isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
static ssize_t
isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off)
{
static ssize_t
isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off)
{
- uint minor = iminor(file->f_dentry->d_inode);
+ uint minor = iminor(file->f_
path.
dentry->d_inode);
int drvidx;
int chidx;
int retval;
int drvidx;
int chidx;
int retval;
@@
-1228,7
+1228,7
@@
static unsigned int
isdn_poll(struct file *file, poll_table * wait)
{
unsigned int mask = 0;
isdn_poll(struct file *file, poll_table * wait)
{
unsigned int mask = 0;
- unsigned int minor = iminor(file->f_dentry->d_inode);
+ unsigned int minor = iminor(file->f_
path.
dentry->d_inode);
int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL);
lock_kernel();
int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL);
lock_kernel();
@@
-2072,21
+2072,19
@@
isdn_add_channels(isdn_driver_t *d, int drvidx, int n, int adding)
if ((adding) && (d->rcverr))
kfree(d->rcverr);
if ((adding) && (d->rcverr))
kfree(d->rcverr);
- if (!(d->rcverr = k
m
alloc(sizeof(int) * m, GFP_ATOMIC))) {
+ if (!(d->rcverr = k
z
alloc(sizeof(int) * m, GFP_ATOMIC))) {
printk(KERN_WARNING "register_isdn: Could not alloc rcverr\n");
return -1;
}
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 ((adding) && (d->rcvcount))
kfree(d->rcvcount);
- if (!(d->rcvcount = k
m
alloc(sizeof(int) * m, GFP_ATOMIC))) {
+ if (!(d->rcvcount = k
z
alloc(sizeof(int) * m, GFP_ATOMIC))) {
printk(KERN_WARNING "register_isdn: Could not alloc rcvcount\n");
if (!adding)
kfree(d->rcverr);
return -1;
}
printk(KERN_WARNING "register_isdn: Could not alloc rcvcount\n");
if (!adding)
kfree(d->rcverr);
return -1;
}
- memset((char *) d->rcvcount, 0, sizeof(int) * m);
if ((adding) && (d->rpqueue)) {
for (j = 0; j < d->channels; j++)
if ((adding) && (d->rpqueue)) {
for (j = 0; j < d->channels; j++)
@@
-2226,11
+2224,10
@@
register_isdn(isdn_if * i)
printk(KERN_WARNING "register_isdn: No write routine given.\n");
return 0;
}
printk(KERN_WARNING "register_isdn: No write routine given.\n");
return 0;
}
- if (!(d = k
m
alloc(sizeof(isdn_driver_t), GFP_KERNEL))) {
+ if (!(d = k
z
alloc(sizeof(isdn_driver_t), GFP_KERNEL))) {
printk(KERN_WARNING "register_isdn: Could not alloc driver-struct\n");
return 0;
}
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;
d->pktcount = 0;
d->maxbufsize = i->maxbufsize;
d->pktcount = 0;