lkml.org 
[lkml]   [2013]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.8 76/81] serial: vt8500: add missing braces
    Date
    3.8.13.12 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Roel Kluin <roel.kluin@gmail.com>

    commit d969de8d83401683420638c8107dcfedb2146f37 upstream.

    Due to missing braces on an if statement, in presence of a device_node a
    port was always assigned -1, regardless of any alias entries in the
    device tree. Conversely, if device_node was NULL, an unitialized port
    ended up being used.

    This patch adds the missing braces, fixing the issues.

    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Acked-by: Tony Prisk <linux@prisktech.co.nz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/tty/serial/vt8500_serial.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c
    index 90b837f..7e713cf 100644
    --- a/drivers/tty/serial/vt8500_serial.c
    +++ b/drivers/tty/serial/vt8500_serial.c
    @@ -567,12 +567,13 @@ static int vt8500_serial_probe(struct platform_device *pdev)
    if (!mmres || !irqres)
    return -ENODEV;

    - if (np)
    + if (np) {
    port = of_alias_get_id(np, "serial");
    if (port >= VT8500_MAX_PORTS)
    port = -1;
    - else
    + } else {
    port = -1;
    + }

    if (port < 0) {
    /* calculate the port id */
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-10-29 20:01    [W:4.277 / U:0.308 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site