lkml.org 
[lkml]   [2012]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 30/75] tty: serial: altera_uart: Check for NULL platform_data in probe.
    3.3-stable review patch.  If anyone has any objections, please let me know.

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

    From: Yuriy Kozlov <ykozlov@ptcusa.com>

    commit acede70d6561f2d042d9dbb153d9a3469479c0ed upstream.

    Follow altera_jtag_uart. This fixes a crash if there is a mistake in the DTS.

    Signed-off-by: Yuriy Kozlov <ykozlov@ptcusa.com>
    Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/tty/serial/altera_uart.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/tty/serial/altera_uart.c
    +++ b/drivers/tty/serial/altera_uart.c
    @@ -555,7 +555,7 @@ static int __devinit altera_uart_probe(s
    res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
    if (res_mem)
    port->mapbase = res_mem->start;
    - else if (platp->mapbase)
    + else if (platp)
    port->mapbase = platp->mapbase;
    else
    return -EINVAL;
    @@ -563,7 +563,7 @@ static int __devinit altera_uart_probe(s
    res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
    if (res_irq)
    port->irq = res_irq->start;
    - else if (platp->irq)
    + else if (platp)
    port->irq = platp->irq;

    /* Check platform data first so we can override device node data */



    \
     
     \ /
      Last update: 2012-04-19 23:15    [W:0.023 / U:60.288 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site