diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /drivers/usb/gadget | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
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); |