serial: fix test of unsigned
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>
This commit is contained in:
Родитель
2a52fcb54f
Коммит
1e091751cd
|
@ -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;
|
||||
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче