projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usb: gadget: udc: atmel: fix possible oops when unloading module
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
usb
/
gadget
/
udc
/
atmel_usba_udc.c
diff --git
a/drivers/usb/gadget/udc/atmel_usba_udc.c
b/drivers/usb/gadget/udc/atmel_usba_udc.c
index c9fe67e29d35fcbe420b04a79f6797d531b852e9..9f93bed42052cb5c910d5f34218287e58a558c6b 100644
(file)
--- a/
drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/
drivers/usb/gadget/udc/atmel_usba_udc.c
@@
-463,7
+463,7
@@
static void receive_data(struct usba_ep *ep)
list_del_init(&req->queue);
usba_ep_writel(ep, CTL_DIS, USBA_RX_BK_RDY);
spin_unlock(&udc->lock);
list_del_init(&req->queue);
usba_ep_writel(ep, CTL_DIS, USBA_RX_BK_RDY);
spin_unlock(&udc->lock);
-
req->req.complete
(&ep->ep, &req->req);
+
usb_gadget_giveback_request
(&ep->ep, &req->req);
spin_lock(&udc->lock);
}
spin_lock(&udc->lock);
}
@@
-495,7
+495,7
@@
request_complete(struct usba_ep *ep, struct usba_request *req, int status)
ep->ep.name, req, req->req.status, req->req.actual);
spin_unlock(&udc->lock);
ep->ep.name, req, req->req.status, req->req.actual);
spin_unlock(&udc->lock);
-
req->req.complete
(&ep->ep, &req->req);
+
usb_gadget_giveback_request
(&ep->ep, &req->req);
spin_lock(&udc->lock);
}
spin_lock(&udc->lock);
}
@@
-716,10
+716,10
@@
static int queue_dma(struct usba_udc *udc, struct usba_ep *ep,
req->using_dma = 1;
req->ctrl = USBA_BF(DMA_BUF_LEN, req->req.length)
| USBA_DMA_CH_EN | USBA_DMA_END_BUF_IE
req->using_dma = 1;
req->ctrl = USBA_BF(DMA_BUF_LEN, req->req.length)
| USBA_DMA_CH_EN | USBA_DMA_END_BUF_IE
- | USBA_DMA_END_
TR_EN | USBA_DMA_END_TR_IE
;
+ | USBA_DMA_END_
BUF_EN
;
- if (ep->is_in)
- req->ctrl |= USBA_DMA_END_
BUF_EN
;
+ if (
!
ep->is_in)
+ req->ctrl |= USBA_DMA_END_
TR_EN | USBA_DMA_END_TR_IE
;
/*
* Add this request to the queue and submit for DMA if
/*
* Add this request to the queue and submit for DMA if
@@
-828,7
+828,7
@@
static int usba_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
{
struct usba_ep *ep = to_usba_ep(_ep);
struct usba_udc *udc = ep->udc;
{
struct usba_ep *ep = to_usba_ep(_ep);
struct usba_udc *udc = ep->udc;
- struct usba_request *req
= to_usba_req(_req)
;
+ struct usba_request *req;
unsigned long flags;
u32 status;
unsigned long flags;
u32 status;
@@
-837,6
+837,16
@@
static int usba_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
spin_lock_irqsave(&udc->lock, flags);
spin_lock_irqsave(&udc->lock, flags);
+ list_for_each_entry(req, &ep->queue, queue) {
+ if (&req->req == _req)
+ break;
+ }
+
+ if (&req->req != _req) {
+ spin_unlock_irqrestore(&udc->lock, flags);
+ return -EINVAL;
+ }
+
if (req->using_dma) {
/*
* If this request is currently being transferred,
if (req->using_dma) {
/*
* If this request is currently being transferred,
@@
-987,8
+997,8
@@
usba_udc_set_selfpowered(struct usb_gadget *gadget, int is_selfpowered)
static int atmel_usba_start(struct usb_gadget *gadget,
struct usb_gadget_driver *driver);
static int atmel_usba_start(struct usb_gadget *gadget,
struct usb_gadget_driver *driver);
-static int atmel_usba_stop(struct usb_gadget *gadget
,
- struct usb_gadget_driver *driver);
+static int atmel_usba_stop(struct usb_gadget *gadget
);
+
static const struct usb_gadget_ops usba_udc_ops = {
.get_frame = usba_udc_get_frame,
.wakeup = usba_udc_wakeup,
static const struct usb_gadget_ops usba_udc_ops = {
.get_frame = usba_udc_get_frame,
.wakeup = usba_udc_wakeup,
@@
-1007,19
+1017,10
@@
static struct usb_endpoint_descriptor usba_ep0_desc = {
.bInterval = 1,
};
.bInterval = 1,
};
-static void nop_release(struct device *dev)
-{
-
-}
-
static struct usb_gadget usba_gadget_template = {
.ops = &usba_udc_ops,
.max_speed = USB_SPEED_HIGH,
.name = "atmel_usba_udc",
static struct usb_gadget usba_gadget_template = {
.ops = &usba_udc_ops,
.max_speed = USB_SPEED_HIGH,
.name = "atmel_usba_udc",
- .dev = {
- .init_name = "gadget",
- .release = nop_release,
- },
};
/*
};
/*
@@
-1572,7
+1573,6
@@
static void usba_ep_irq(struct usba_udc *udc, struct usba_ep *ep)
if ((epstatus & epctrl) & USBA_RX_BK_RDY) {
DBG(DBG_BUS, "%s: RX data ready\n", ep->ep.name);
receive_data(ep);
if ((epstatus & epctrl) & USBA_RX_BK_RDY) {
DBG(DBG_BUS, "%s: RX data ready\n", ep->ep.name);
receive_data(ep);
- usba_ep_writel(ep, CLR_STA, USBA_RX_BK_RDY);
}
}
}
}
@@
-1685,11
+1685,10
@@
static irqreturn_t usba_udc_irq(int irq, void *devid)
usba_writel(udc, INT_CLR, USBA_END_OF_RESET);
reset_all_endpoints(udc);
usba_writel(udc, INT_CLR, USBA_END_OF_RESET);
reset_all_endpoints(udc);
- if (udc->gadget.speed != USB_SPEED_UNKNOWN
- && udc->driver && udc->driver->disconnect) {
+ if (udc->gadget.speed != USB_SPEED_UNKNOWN && udc->driver) {
udc->gadget.speed = USB_SPEED_UNKNOWN;
spin_unlock(&udc->lock);
udc->gadget.speed = USB_SPEED_UNKNOWN;
spin_unlock(&udc->lock);
- u
dc->driver->disconnect(&udc->gadget
);
+ u
sb_gadget_udc_reset(&udc->gadget, udc->driver
);
spin_lock(&udc->lock);
}
spin_lock(&udc->lock);
}
@@
-1791,8
+1790,6
@@
static int atmel_usba_start(struct usb_gadget *gadget,
return ret;
}
return ret;
}
- DBG(DBG_GADGET, "registered driver `%s'\n", driver->driver.name);
-
udc->vbus_prev = 0;
if (gpio_is_valid(udc->vbus_pin))
enable_irq(gpio_to_irq(udc->vbus_pin));
udc->vbus_prev = 0;
if (gpio_is_valid(udc->vbus_pin))
enable_irq(gpio_to_irq(udc->vbus_pin));
@@
-1809,8
+1806,7
@@
static int atmel_usba_start(struct usb_gadget *gadget,
return 0;
}
return 0;
}
-static int atmel_usba_stop(struct usb_gadget *gadget,
- struct usb_gadget_driver *driver)
+static int atmel_usba_stop(struct usb_gadget *gadget)
{
struct usba_udc *udc = container_of(gadget, struct usba_udc, gadget);
unsigned long flags;
{
struct usba_udc *udc = container_of(gadget, struct usba_udc, gadget);
unsigned long flags;
@@
-1830,8
+1826,6
@@
static int atmel_usba_stop(struct usb_gadget *gadget,
clk_disable_unprepare(udc->hclk);
clk_disable_unprepare(udc->pclk);
clk_disable_unprepare(udc->hclk);
clk_disable_unprepare(udc->pclk);
- DBG(DBG_GADGET, "unregistered driver `%s'\n", udc->driver->driver.name);
-
udc->driver = NULL;
return 0;
udc->driver = NULL;
return 0;
@@
-2120,7
+2114,6
@@
static struct platform_driver udc_driver = {
.remove = __exit_p(usba_udc_remove),
.driver = {
.name = "atmel_usba_udc",
.remove = __exit_p(usba_udc_remove),
.driver = {
.name = "atmel_usba_udc",
- .owner = THIS_MODULE,
.of_match_table = of_match_ptr(atmel_udc_dt_ids),
},
};
.of_match_table = of_match_ptr(atmel_udc_dt_ids),
},
};