diff options
author | David S. Miller <davem@davemloft.net> | 2010-07-23 14:03:38 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-07-23 14:03:38 -0700 |
commit | 2a88e7e559f2358f4e1422d0b0c0278a74136581 (patch) | |
tree | b4e9e56dbde79fe7185cba511a1ffd85f5d2018e /drivers/net/wireless/libertas/debugfs.c | |
parent | 344e0f623cec5eba273db06fe57db080988d6b26 (diff) | |
parent | 7a17a33c0da37f8d24222c967550d19dabf13617 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-commands.h
Diffstat (limited to 'drivers/net/wireless/libertas/debugfs.c')
-rw-r--r-- | drivers/net/wireless/libertas/debugfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c index acaf81164624..3db621b18a2f 100644 --- a/drivers/net/wireless/libertas/debugfs.c +++ b/drivers/net/wireless/libertas/debugfs.c @@ -905,7 +905,7 @@ static ssize_t lbs_debugfs_read(struct file *file, char __user *userbuf, p = buf; - d = (struct debug_data *)file->private_data; + d = file->private_data; for (i = 0; i < num_of_items; i++) { if (d[i].size == 1) @@ -944,7 +944,7 @@ static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf, char *p0; char *p1; char *p2; - struct debug_data *d = (struct debug_data *)f->private_data; + struct debug_data *d = f->private_data; pdata = kmalloc(cnt, GFP_KERNEL); if (pdata == NULL) |