linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kishon Vijay Abraham I <kishon@ti.com>
To: <balbi@ti.com>, <gregkh@linuxfoundation.org>,
	<linux-usb@vger.kernel.org>, <linux-omap@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>
Cc: <tony@atomide.com>, <notasas@gmail.com>,
	Kishon Vijay Abraham I <kishon@ti.com>
Subject: [PATCH 2/5] usb: musb: omap: always glue have the correct vbus/id status
Date: Wed, 13 Mar 2013 14:17:07 +0530	[thread overview]
Message-ID: <1363164430-19118-3-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1363164430-19118-1-git-send-email-kishon@ti.com>

In the case where omap glue is loaded and musb core is not, glue->status
wont have a valid status if the phy drivers call omap_musb_mailbox. So
fixed the conditions here.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 drivers/usb/musb/omap2430.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 78bfc50..28a0220 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -236,13 +236,10 @@ void omap_musb_mailbox(enum omap_musb_vbus_id_status status)
 {
 	struct omap2430_glue	*glue = _glue;
 
-	if (glue && glue_to_musb(glue)) {
-		glue->status = status;
-	} else {
-		pr_err("%s: musb core is not yet ready\n", __func__);
+	if (!glue)
 		return;
-	}
 
+	glue->status = status;
 	schedule_work(&glue->omap_musb_mailbox_work);
 }
 EXPORT_SYMBOL_GPL(omap_musb_mailbox);
@@ -307,7 +304,9 @@ static void omap_musb_mailbox_work(struct work_struct *mailbox_work)
 {
 	struct omap2430_glue *glue = container_of(mailbox_work,
 				struct omap2430_glue, omap_musb_mailbox_work);
-	omap_musb_set_mailbox(glue);
+
+	if (glue_to_musb(glue))
+		omap_musb_set_mailbox(glue);
 }
 
 static irqreturn_t omap2430_musb_interrupt(int irq, void *__hci)
-- 
1.7.10.4


  parent reply	other threads:[~2013-03-13  8:47 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-13  8:47 [PATCH 0/5] usb: musb/otg: cleanup and fixes Kishon Vijay Abraham I
2013-03-13  8:47 ` [PATCH 1/5] usb: musb: omap: remove the check before calling otg_set_vbus Kishon Vijay Abraham I
2013-03-13  8:47 ` Kishon Vijay Abraham I [this message]
2013-03-13 21:59   ` [PATCH 2/5] usb: musb: omap: always glue have the correct vbus/id status Grazvydas Ignotas
2013-03-14  5:26     ` kishon
2013-03-13  8:47 ` [PATCH 3/5] usb: otg: twl4030: use devres API for regulator get and request irq Kishon Vijay Abraham I
2013-03-13  8:47 ` [PATCH 4/5] usb: musb: omap: add usb_phy_init in omap2430_musb_init Kishon Vijay Abraham I
2013-03-13  8:47 ` [PATCH 5/5] usb: otg: twl4030: fix cold plug on OMAP3 Kishon Vijay Abraham I
2013-03-13 22:00 ` [PATCH 0/5] usb: musb/otg: cleanup and fixes Grazvydas Ignotas
2013-03-20 13:12 ` Felipe Balbi
2013-03-20 15:22   ` kishon
2013-03-20 15:59     ` Felipe Balbi
2014-06-02  7:31 ` sarfaraz5286
2014-06-04  6:21   ` sarfaraz5286

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1363164430-19118-3-git-send-email-kishon@ti.com \
    --to=kishon@ti.com \
    --cc=balbi@ti.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=notasas@gmail.com \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).