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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
usb
/
mon
/
mon_stat.c
diff --git
a/drivers/usb/mon/mon_stat.c
b/drivers/usb/mon/mon_stat.c
index
6e4b165
..
f6d1491
100644
(file)
--- a/
drivers/usb/mon/mon_stat.c
+++ b/
drivers/usb/mon/mon_stat.c
@@
-28,11
+28,11
@@
static int mon_stat_open(struct inode *inode, struct file *file)
if ((sp = kmalloc(sizeof(struct snap), GFP_KERNEL)) == NULL)
return -ENOMEM;
if ((sp = kmalloc(sizeof(struct snap), GFP_KERNEL)) == NULL)
return -ENOMEM;
- mbus = inode->
u.generic_ip
;
+ mbus = inode->
i_private
;
sp->slen = snprintf(sp->str, STAT_BUF_SIZE,
sp->slen = snprintf(sp->str, STAT_BUF_SIZE,
- "nreaders %d text_lost %u\n",
- mbus->nreaders, mbus->cnt_text_lost);
+ "nreaders %d
events %u
text_lost %u\n",
+ mbus->nreaders, mbus->cnt_
events, mbus->cnt_
text_lost);
file->private_data = sp;
return 0;
file->private_data = sp;
return 0;
@@
-62,7
+62,7
@@
static int mon_stat_release(struct inode *inode, struct file *file)
return 0;
}
return 0;
}
-struct file_operations mon_fops_stat = {
+
const
struct file_operations mon_fops_stat = {
.owner = THIS_MODULE,
.open = mon_stat_open,
.llseek = no_llseek,
.owner = THIS_MODULE,
.open = mon_stat_open,
.llseek = no_llseek,