Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 208016
b: refs/heads/master
c: fd63b10
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and Greg Kroah-Hartman committed Aug 10, 2010
1 parent 1187454 commit 7176248
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5bd6e8b3fb787b7337b681aaa601e5c7bdc67c55
refs/heads/master: fd63b10ba33f272308d9f976a40f2cd064d8b21b
6 changes: 3 additions & 3 deletions trunk/drivers/usb/gadget/f_hid.c
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ static struct usb_descriptor_header *hidg_fs_descriptors[] = {
static ssize_t f_hidg_read(struct file *file, char __user *buffer,
size_t count, loff_t *ptr)
{
struct f_hidg *hidg = (struct f_hidg *)file->private_data;
struct f_hidg *hidg = file->private_data;
char *tmp_buff = NULL;
unsigned long flags;

Expand Down Expand Up @@ -200,7 +200,7 @@ static void f_hidg_req_complete(struct usb_ep *ep, struct usb_request *req)
static ssize_t f_hidg_write(struct file *file, const char __user *buffer,
size_t count, loff_t *offp)
{
struct f_hidg *hidg = (struct f_hidg *)file->private_data;
struct f_hidg *hidg = file->private_data;
ssize_t status = -ENOMEM;

if (!access_ok(VERIFY_READ, buffer, count))
Expand Down Expand Up @@ -257,7 +257,7 @@ static ssize_t f_hidg_write(struct file *file, const char __user *buffer,

static unsigned int f_hidg_poll(struct file *file, poll_table *wait)
{
struct f_hidg *hidg = (struct f_hidg *)file->private_data;
struct f_hidg *hidg = file->private_data;
unsigned int ret = 0;

poll_wait(file, &hidg->read_queue, wait);
Expand Down

0 comments on commit 7176248

Please sign in to comment.