usb: renesas_usbhs: avoid uninitialized variable use
authorArnd Bergmann <arnd@arndb.de>
Fri, 22 May 2015 11:06:35 +0000 (13:06 +0200)
committerFelipe Balbi <balbi@ti.com>
Fri, 22 May 2015 13:52:16 +0000 (08:52 -0500)
After the renesas_usbhs driver is enabled in ARM multi_v7_defconfig,
we now get a new warning:

renesas_usbhs/mod.c: In function 'usbhs_interrupt':
renesas_usbhs/mod.c:246:7: warning: 'intenb1' may be used uninitialized in this function [-Wmaybe-uninitialized]

gcc correctly points to a problem here, for the case that the
device is in host mode, we use the intenb1 variable without
having assigned it first. The state->intsts1 has a similar
problem, but gcc cannot know that.

This avoids the problem by initializing both sides of the
comparison to zero when we don't read them from the respective
registers.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 88a25e02f3 ("usb: renesas_usbhs: Add access control for INTSTS1 and INTENB1 register")
Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/renesas_usbhs/mod.c

index e5ce6e6d4f51bbc11153a844960dd692ac1516c0..d4be5d5948960cd32353d3007be4373d914be114 100644 (file)
@@ -223,6 +223,8 @@ static int usbhs_status_get_each_irq(struct usbhs_priv *priv,
        if (usbhs_mod_is_host(priv)) {
                state->intsts1 = usbhs_read(priv, INTSTS1);
                intenb1 = usbhs_read(priv, INTENB1);
+       } else {
+               state->intsts1 = intenb1 = 0;
        }
 
        /* mask */