aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/musb_debugfs.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-20 16:44:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-20 16:44:40 -0700
commit0c4ab3453aae7bba4d76a3eb4b289aa53a9f9a60 (patch)
tree5324be527053594218107f3890c919ed8fae1f3d /drivers/usb/musb/musb_debugfs.c
parent36ff4a5517779355f4bd62030cdb8498c3954f29 (diff)
parentf299470a15ab3057afbf598cec59246a90ade449 (diff)
downloadmrst-s0i3-test-0c4ab3453aae7bba4d76a3eb4b289aa53a9f9a60.tar.gz
mrst-s0i3-test-0c4ab3453aae7bba4d76a3eb4b289aa53a9f9a60.tar.xz
mrst-s0i3-test-0c4ab3453aae7bba4d76a3eb4b289aa53a9f9a60.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: USB: musb: MAINTAINERS: Fix my mail address USB: serial/mos*: prevent reading uninitialized stack memory USB: otg: twl4030: fix phy initialization(v1) USB: EHCI: Disable langwell/penwell LPM capability usb: musb_debugfs: don't use the struct file private_data field with seq_files
Diffstat (limited to 'drivers/usb/musb/musb_debugfs.c')
-rw-r--r--drivers/usb/musb/musb_debugfs.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c
index c79a5e30d43..9e8639d4e86 100644
--- a/drivers/usb/musb/musb_debugfs.c
+++ b/drivers/usb/musb/musb_debugfs.c
@@ -195,15 +195,14 @@ static const struct file_operations musb_regdump_fops = {
static int musb_test_mode_open(struct inode *inode, struct file *file)
{
- file->private_data = inode->i_private;
-
return single_open(file, musb_test_mode_show, inode->i_private);
}
static ssize_t musb_test_mode_write(struct file *file,
const char __user *ubuf, size_t count, loff_t *ppos)
{
- struct musb *musb = file->private_data;
+ struct seq_file *s = file->private_data;
+ struct musb *musb = s->private;
u8 test = 0;
char buf[18];