* [PATCH 0/2] musb fixes for v5.5-rc3
@ 2019-12-16 16:18 Bin Liu
2019-12-16 16:18 ` [PATCH 1/2] usb: musb: dma: Correct parameter passed to IRQ handler Bin Liu
2019-12-16 16:18 ` [PATCH 2/2] usb: musb: jz4740: Silence error if code is -EPROBE_DEFER Bin Liu
0 siblings, 2 replies; 4+ messages in thread
From: Bin Liu @ 2019-12-16 16:18 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-usb, Bin Liu
Hi Greg,
Here are couple patches for musb fixes for v5.5 -rc. Please let me know
if any change is needed.
Regards,
-Bin.
---
Paul Cercueil (2):
usb: musb: dma: Correct parameter passed to IRQ handler
usb: musb: jz4740: Silence error if code is -EPROBE_DEFER
drivers/usb/musb/jz4740.c | 7 +++++--
drivers/usb/musb/musbhsdma.c | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] usb: musb: dma: Correct parameter passed to IRQ handler
2019-12-16 16:18 [PATCH 0/2] musb fixes for v5.5-rc3 Bin Liu
@ 2019-12-16 16:18 ` Bin Liu
2019-12-16 16:18 ` [PATCH 2/2] usb: musb: jz4740: Silence error if code is -EPROBE_DEFER Bin Liu
1 sibling, 0 replies; 4+ messages in thread
From: Bin Liu @ 2019-12-16 16:18 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-usb, Bin Liu
From: Paul Cercueil <paul@crapouillou.net>
The IRQ handler was passed a pointer to a struct dma_controller, but the
argument was then casted to a pointer to a struct musb_dma_controller.
Fixes: 427c4f333474 ("usb: struct device - replace bus_id with dev_name(), dev_set_name()")
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Tested-by: Artur Rojek <contact@artur-rojek.eu>
Cc: stable@vger.kernel.org
Signed-off-by: Bin Liu <b-liu@ti.com>
---
drivers/usb/musb/musbhsdma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index 5fc6825745f2..2d3751d885b4 100644
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -425,7 +425,7 @@ struct dma_controller *musbhs_dma_controller_create(struct musb *musb,
controller->controller.channel_abort = dma_channel_abort;
if (request_irq(irq, dma_controller_irq, 0,
- dev_name(musb->controller), &controller->controller)) {
+ dev_name(musb->controller), controller)) {
dev_err(dev, "request_irq %d failed!\n", irq);
musb_dma_controller_destroy(&controller->controller);
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] usb: musb: jz4740: Silence error if code is -EPROBE_DEFER
2019-12-16 16:18 [PATCH 0/2] musb fixes for v5.5-rc3 Bin Liu
2019-12-16 16:18 ` [PATCH 1/2] usb: musb: dma: Correct parameter passed to IRQ handler Bin Liu
@ 2019-12-16 16:18 ` Bin Liu
2019-12-16 16:24 ` [PATCH 2/2 v2] " Bin Liu
1 sibling, 1 reply; 4+ messages in thread
From: Bin Liu @ 2019-12-16 16:18 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-usb, Bin Liu
From: Paul Cercueil <paul@crapouillou.net>
Avoid printing any error message if the error code is -EPROBE_DEFER.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
drivers/usb/musb/jz4740.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/musb/jz4740.c b/drivers/usb/musb/jz4740.c
index 5261f8dfedec..e3b8c84ccdb8 100644
--- a/drivers/usb/musb/jz4740.c
+++ b/drivers/usb/musb/jz4740.c
@@ -75,14 +75,17 @@ static struct musb_hdrc_platform_data jz4740_musb_platform_data = {
static int jz4740_musb_init(struct musb *musb)
{
struct device *dev = musb->controller->parent;
+ int err;
if (dev->of_node)
musb->xceiv = devm_usb_get_phy_by_phandle(dev, "phys", 0);
else
musb->xceiv = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
if (IS_ERR(musb->xceiv)) {
- dev_err(dev, "No transceiver configured\n");
- return PTR_ERR(musb->xceiv);
+ err = PTR_ERR(musb->xceiv);
+ if (err != -EPROBE_DEFER)
+ dev_err(dev, "No transceiver configured: %d", err);
+ return err;
}
/* Silicon does not implement ConfigData register.
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2 v2] usb: musb: jz4740: Silence error if code is -EPROBE_DEFER
2019-12-16 16:18 ` [PATCH 2/2] usb: musb: jz4740: Silence error if code is -EPROBE_DEFER Bin Liu
@ 2019-12-16 16:24 ` Bin Liu
0 siblings, 0 replies; 4+ messages in thread
From: Bin Liu @ 2019-12-16 16:24 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-usb, Bin Liu
From: Paul Cercueil <paul@crapouillou.net>
Avoid printing any error message if the error code is -EPROBE_DEFER.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Bin Liu <b-liu@ti.com>
---
v2: add signed-off
drivers/usb/musb/jz4740.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/musb/jz4740.c b/drivers/usb/musb/jz4740.c
index 5261f8dfedec..e3b8c84ccdb8 100644
--- a/drivers/usb/musb/jz4740.c
+++ b/drivers/usb/musb/jz4740.c
@@ -75,14 +75,17 @@ static struct musb_hdrc_platform_data jz4740_musb_platform_data = {
static int jz4740_musb_init(struct musb *musb)
{
struct device *dev = musb->controller->parent;
+ int err;
if (dev->of_node)
musb->xceiv = devm_usb_get_phy_by_phandle(dev, "phys", 0);
else
musb->xceiv = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
if (IS_ERR(musb->xceiv)) {
- dev_err(dev, "No transceiver configured\n");
- return PTR_ERR(musb->xceiv);
+ err = PTR_ERR(musb->xceiv);
+ if (err != -EPROBE_DEFER)
+ dev_err(dev, "No transceiver configured: %d", err);
+ return err;
}
/* Silicon does not implement ConfigData register.
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-12-16 16:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-16 16:18 [PATCH 0/2] musb fixes for v5.5-rc3 Bin Liu
2019-12-16 16:18 ` [PATCH 1/2] usb: musb: dma: Correct parameter passed to IRQ handler Bin Liu
2019-12-16 16:18 ` [PATCH 2/2] usb: musb: jz4740: Silence error if code is -EPROBE_DEFER Bin Liu
2019-12-16 16:24 ` [PATCH 2/2 v2] " Bin Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).