Merge "usb: gadget: f_hid: fix: Free out requests" (6cc6df43) · Commits · e / devices / android_kernel_sony_msm8998

drivers/usb/gadget/function/f_hid.c

+24 −8

Original line number	Diff line number	Diff line
		@@ -383,12 +383,17 @@ static inline struct usb_request hidg_alloc_ep_req(struct usb_ep ep,
		static void hidg_set_report_complete(struct usb_ep ep, struct usb_request req)
		{
		struct f_hidg hidg = (struct f_hidg ) req->context;
		struct usb_composite_dev *cdev = hidg->func.config->cdev;
		struct f_hidg_req_list *req_list;
		unsigned long flags;

		switch (req->status) {
		case 0:
		req_list = kzalloc(sizeof(*req_list), GFP_ATOMIC);
		if (!req_list)
		return;
		if (!req_list) {
		ERROR(cdev, "Unable to allocate mem for req_list\n");
		goto free_req;
		}

		req_list->req = req;

		@@ -397,6 +402,17 @@ static void hidg_set_report_complete(struct usb_ep ep, struct usb_request req)
		spin_unlock_irqrestore(&hidg->spinlock, flags);

		wake_up(&hidg->read_queue);
		break;
		default:
		ERROR(cdev, "Set report failed %d\n", req->status);
		/* FALLTHROUGH */
		case -ECONNABORTED: /* hardware forced ep reset */
		case -ECONNRESET: /* request dequeued */
		case -ESHUTDOWN: /* disconnect from host */
		free_req:
		free_ep_req(ep, req);
		return;
		}
		}

		static int hidg_setup(struct usb_function *f,