lkml.org 
[lkml]   [2014]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 027/144] usb: chipidea: host: Only disable the vbus regulator if it is not NULL
    Date
    3.12-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Fabio Estevam <fabio.estevam@freescale.com>

    commit cc5c9eb67f912cb2c349b04063ff9f444affbc59 upstream.

    Commit 40ed51a4b (usb: chipidea: host: add vbus regulator
    control) introduced a smatch complaint because regulator_disable() is called
    without checking whether ci->platdata->reg_vbus is not NULL.

    Fix this by adding the check.

    This patch is needed for 3.12 stable

    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
    Signed-off-by: Peter Chen <peter.chen@freescale.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/chipidea/host.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/usb/chipidea/host.c
    +++ b/drivers/usb/chipidea/host.c
    @@ -88,7 +88,8 @@ static int host_start(struct ci_hdrc *ci
    return ret;

    disable_reg:
    - regulator_disable(ci->platdata->reg_vbus);
    + if (ci->platdata->reg_vbus)
    + regulator_disable(ci->platdata->reg_vbus);

    put_hcd:
    usb_put_hcd(hcd);



    \
     
     \ /
      Last update: 2014-01-07 02:01    [W:8.470 / U:0.940 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site