Merge git://git.infradead.org/~dwmw2/rbtree-2.6

[linux-2.6-omap-h63xx.git] / drivers / usb / gadget / inode.c

diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 42b457030b0310420931fc481e6f2d7316f87fd3..0eb010a3f5bc331d52e4fc4c3819eeca57e897d2 100644 (file)
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1614,6 +1614,7 @@ static int activate_ep_files (struct dev_data *dev)
                                data, &ep_config_operations,
                                &data->dentry);
                if (!data->inode) {
+                       usb_ep_free_request(ep, data->req);
                        kfree (data);
                        goto enomem;
                }