diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 09:49:01 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 09:49:01 -0500 |
| commit | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (patch) | |
| tree | bbcafe7f23975979f7a2bc6fd1404908d5fd7bd1 /drivers/usb/gadget | |
| parent | e3bd9ec5d8bfc90f9e1bd995677829e57a404061 (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-moves2
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c index f4585d3e90d7..eeb26c0f88e5 100644 --- a/drivers/usb/gadget/inode.c +++ b/drivers/usb/gadget/inode.c | |||
| @@ -1251,7 +1251,6 @@ dev_release (struct inode *inode, struct file *fd) | |||
| 1251 | * alternatively, all host requests will time out. | 1251 | * alternatively, all host requests will time out. |
| 1252 | */ | 1252 | */ |
| 1253 | 1253 | ||
| 1254 | fasync_helper (-1, fd, 0, &dev->fasync); | ||
| 1255 | kfree (dev->buf); | 1254 | kfree (dev->buf); |
| 1256 | dev->buf = NULL; | 1255 | dev->buf = NULL; |
| 1257 | put_dev (dev); | 1256 | put_dev (dev); |