|
@@ -453,7 +453,7 @@ static struct uart_driver digicolor_uart = {
|
|
static int digicolor_uart_probe(struct platform_device *pdev)
|
|
static int digicolor_uart_probe(struct platform_device *pdev)
|
|
{
|
|
{
|
|
struct device_node *np = pdev->dev.of_node;
|
|
struct device_node *np = pdev->dev.of_node;
|
|
- int ret, index;
|
|
|
|
|
|
+ int irq, ret, index;
|
|
struct digicolor_port *dp;
|
|
struct digicolor_port *dp;
|
|
struct resource *res;
|
|
struct resource *res;
|
|
struct clk *uart_clk;
|
|
struct clk *uart_clk;
|
|
@@ -481,9 +481,10 @@ static int digicolor_uart_probe(struct platform_device *pdev)
|
|
if (IS_ERR(dp->port.membase))
|
|
if (IS_ERR(dp->port.membase))
|
|
return PTR_ERR(dp->port.membase);
|
|
return PTR_ERR(dp->port.membase);
|
|
|
|
|
|
- dp->port.irq = platform_get_irq(pdev, 0);
|
|
|
|
- if (IS_ERR_VALUE(dp->port.irq))
|
|
|
|
- return dp->port.irq;
|
|
|
|
|
|
+ irq = platform_get_irq(pdev, 0);
|
|
|
|
+ if (irq < 0)
|
|
|
|
+ return irq;
|
|
|
|
+ dp->port.irq = irq;
|
|
|
|
|
|
dp->port.iotype = UPIO_MEM;
|
|
dp->port.iotype = UPIO_MEM;
|
|
dp->port.uartclk = clk_get_rate(uart_clk);
|
|
dp->port.uartclk = clk_get_rate(uart_clk);
|