usb: renesas_usbhs: add usbhsh_is_running()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 9 Dec 2011 02:30:23 +0000 (18:30 -0800)
committerFelipe Balbi <balbi@ti.com>
Tue, 13 Dec 2011 11:06:28 +0000 (13:06 +0200)
It is possible to judge whether renesas_usbhs driver is running,
by checking attch irq mask.
This patch adds usbhsh_is_running() to check it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/renesas_usbhs/mod_host.c

index c947d0aca9bfb68defc75044d5d75d5bd489a864..28b2cb3a029a5e3ca8e8ac741a25575b9352895c 100644 (file)
@@ -190,6 +190,21 @@ static void usbhsh_ureq_free(struct usbhsh_hpriv *hpriv,
        kfree(ureq);
 }
 
+/*
+ *             status
+ */
+static int usbhsh_is_running(struct usbhsh_hpriv *hpriv)
+{
+       /*
+        * we can decide some device is attached or not
+        * by checking mod.irq_attch
+        * see
+        *      usbhsh_irq_attch()
+        *      usbhsh_irq_dtch()
+        */
+       return (hpriv->mod.irq_attch == NULL);
+}
+
 /*
  *             pipe control
  */
@@ -900,6 +915,11 @@ static int usbhsh_urb_enqueue(struct usb_hcd *hcd,
 
        dev_dbg(dev, "%s (%s)\n", __func__, is_dir_in ? "in" : "out");
 
+       if (!usbhsh_is_running(hpriv)) {
+               ret = -EIO;
+               goto usbhsh_urb_enqueue_error_not_linked;
+       }
+
        ret = usb_hcd_link_urb_to_ep(hcd, urb);
        if (ret)
                goto usbhsh_urb_enqueue_error_not_linked;
@@ -1249,6 +1269,12 @@ static int usbhsh_irq_attch(struct usbhs_priv *priv,
         * attch interrupt might happen infinitely on some device
         * (on self power USB hub ?)
         * disable it here.
+        *
+        * usbhsh_is_running() becomes effective
+        * according to this process.
+        * see
+        *      usbhsh_is_running()
+        *      usbhsh_urb_enqueue()
         */
        hpriv->mod.irq_attch = NULL;
        usbhs_irq_callback_update(priv, &hpriv->mod);
@@ -1269,6 +1295,12 @@ static int usbhsh_irq_dtch(struct usbhs_priv *priv,
 
        /*
         * enable attch interrupt again
+        *
+        * usbhsh_is_running() becomes invalid
+        * according to this process.
+        * see
+        *      usbhsh_is_running()
+        *      usbhsh_urb_enqueue()
         */
        hpriv->mod.irq_attch = usbhsh_irq_attch;
        usbhs_irq_callback_update(priv, &hpriv->mod);