mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 16:37:50 +00:00
Code Issues Releases Wiki Activity

Some small bug fixes for both chipidea and cdns USB

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEDaZUZmFxRG/wNThrSFkpgVDWcbsFAmCo29gACgkQSFkpgVDW
 cbtPrwf/ddqvOp96mZ0PUjCSibVm/9KpB3IxMVv8DAAYnMnHm+KBXrSjK2Zg9bm/
 OegHdP0NQLghb42pesiBDoGEkmiQ8siF6LGjifT9posUu2ZJBQJDcHPdl1aIZh+j
 D2i4DQLqlw3rNFktpubuUJq7ZIAacF9Henbr1zt7Ns9fPrnzt6dT/dH+YuFe6uXT
 g/ZXpa4ari/ctqqKeglplMQDL6h3a0QCxTsoU0UVC76/cw1UCOOMcr8QEUH5kngK
 bxVH0yAr51Hz1oUMQBWQS2nMzAy023X9CXgSymGGksHMs7rL1TfKis/i1wnqaFzH
 V0YHSWIHZlGAyLvSl8Mivr9MUTNaAw==
 =LBnr
 -----END PGP SIGNATURE-----

Merge tag 'usb-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-linus

Peter writes:

Some small bug fixes for both chipidea and cdns USB

* tag 'usb-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb:
  usb: chipidea: udc: assign interrupt number to USB gadget structure
  usb: cdnsp: Fix lack of removing request from pending list.
  usb: cdns3: Fix runtime PM imbalance on error
This commit is contained in:
Greg Kroah-Hartman 2021-05-22 13:26:29 +02:00
commit 2cbd838e0e
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/usb/cdns3/cdns3-gadget.c
View file

@ -3268,8 +3268,10 @@ static int __cdns3_gadget_init(struct cdns *cdns)
pm_runtime_get_sync(cdns->dev);
ret = cdns3_gadget_start(cdns);
if (ret)
if (ret) {
pm_runtime_put_sync(cdns->dev);
return ret;
}
/*
* Because interrupt line can be shared with other components in

14
drivers/usb/cdns3/cdnsp-gadget.c
View file

@ -422,17 +422,17 @@ int cdnsp_ep_enqueue(struct cdnsp_ep *pep, struct cdnsp_request *preq)
int cdnsp_ep_dequeue(struct cdnsp_ep *pep, struct cdnsp_request *preq)
{
struct cdnsp_device *pdev = pep->pdev;
int ret;
int ret_stop = 0;
int ret_rem;
trace_cdnsp_request_dequeue(preq);
if (GET_EP_CTX_STATE(pep->out_ctx) == EP_STATE_RUNNING) {
ret = cdnsp_cmd_stop_ep(pdev, pep);
if (ret)
return ret;
}
if (GET_EP_CTX_STATE(pep->out_ctx) == EP_STATE_RUNNING)
ret_stop = cdnsp_cmd_stop_ep(pdev, pep);
return cdnsp_remove_request(pdev, preq, pep);
ret_rem = cdnsp_remove_request(pdev, preq, pep);
return ret_rem ? ret_rem : ret_stop;
}
static void cdnsp_zero_in_ctx(struct cdnsp_device *pdev)

1
drivers/usb/chipidea/udc.c
View file

@ -2061,6 +2061,7 @@ static int udc_start(struct ci_hdrc *ci)
ci->gadget.name = ci->platdata->name;
ci->gadget.otg_caps = otg_caps;
ci->gadget.sg_supported = 1;
ci->gadget.irq = ci->irq;
if (ci->platdata->flags & CI_HDRC_REQUIRES_ALIGNED_DMA)
ci->gadget.quirk_avoids_skb_reserve = 1;