USB: Handle allocated buffer freeing after error and unused variables
Free the allocated buffer after an error and remove
unused variables.
CRs-Fixed: 313681
Change-Id: I76ebf946eacac47682a3c510cd7beed3fc3c6437
Signed-off-by: Rajkumar Raghupathy <raghup@codeaurora.org>
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c
index 8d58833..fdd0ba8 100644
--- a/drivers/usb/gadget/android.c
+++ b/drivers/usb/gadget/android.c
@@ -817,6 +817,7 @@
&common->luns[0].dev.kobj,
"lun");
if (err) {
+ fsg_common_release(&common->ref);
kfree(config);
return err;
}
diff --git a/drivers/usb/gadget/f_rmnet_smd_sdio.c b/drivers/usb/gadget/f_rmnet_smd_sdio.c
index eda547a..2ddbd7c 100644
--- a/drivers/usb/gadget/f_rmnet_smd_sdio.c
+++ b/drivers/usb/gadget/f_rmnet_smd_sdio.c
@@ -1071,7 +1071,7 @@
spin_lock(&dev->lock);
if (!ctrl_dev->opened) {
spin_unlock(&dev->lock);
- kfree(cpkt);
+ rmnet_mux_free_ctrl_pkt(cpkt);
dev->cpkts_drp_cnt++;
pr_err_ratelimited(
"%s: ctrl pkts dropped: cpkts_drp_cnt: %lu\n",
diff --git a/drivers/usb/gadget/u_sdio.c b/drivers/usb/gadget/u_sdio.c
index fd01dbf..6ba7543 100644
--- a/drivers/usb/gadget/u_sdio.c
+++ b/drivers/usb/gadget/u_sdio.c
@@ -1107,7 +1107,6 @@
struct usb_cdc_line_coding coding;
int i;
int ret = 0;
- struct sdio_port_info *port_info;
pr_debug("%s: gadget:(%p) count:%d\n", __func__, g, count);
@@ -1139,7 +1138,6 @@
__func__);
goto free_sdio_ports;
}
- port_info++;
#ifdef DEBUG
/* REVISIT: create one file per port