Skip to content

Commit

Permalink
serial: fix test of unsigned
Browse files Browse the repository at this point in the history
The variables were unsigned so the tests did not work.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Roel Kluin authored and Greg Kroah-Hartman committed Mar 2, 2010
1 parent 2a52fcb commit 1e09175
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
6 changes: 4 additions & 2 deletions drivers/serial/msm_serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
struct msm_port *msm_port;
struct resource *resource;
struct uart_port *port;
int irq;

if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))
return -ENXIO;
Expand All @@ -711,9 +712,10 @@ static int __init msm_serial_probe(struct platform_device *pdev)
return -ENXIO;
port->mapbase = resource->start;

port->irq = platform_get_irq(pdev, 0);
if (unlikely(port->irq < 0))
irq = platform_get_irq(pdev, 0);
if (unlikely(irq < 0))
return -ENXIO;
port->irq = irq;

platform_set_drvdata(pdev, port);

Expand Down
7 changes: 4 additions & 3 deletions drivers/serial/timbuart.c
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ static struct uart_driver timbuart_driver = {

static int timbuart_probe(struct platform_device *dev)
{
int err;
int err, irq;
struct timbuart_port *uart;
struct resource *iomem;

Expand Down Expand Up @@ -453,11 +453,12 @@ static int timbuart_probe(struct platform_device *dev)
uart->port.mapbase = iomem->start;
uart->port.membase = NULL;

uart->port.irq = platform_get_irq(dev, 0);
if (uart->port.irq < 0) {
irq = platform_get_irq(dev, 0);
if (irq < 0) {
err = -EINVAL;
goto err_register;
}
uart->port.irq = irq;

tasklet_init(&uart->tasklet, timbuart_tasklet, (unsigned long)uart);

Expand Down

0 comments on commit 1e09175

Please sign in to comment.