Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / input / serio / olpc_apsp.c

diff --git a/drivers/input/serio/olpc_apsp.c b/drivers/input/serio/olpc_apsp.c
index 8e9a4209fcada1bb580bd4a95f742316d8b2d886..a7cfab3db9ee4b344f5e4c64316d8baaf6c6522a 100644 (file)
--- a/drivers/input/serio/olpc_apsp.c
+++ b/drivers/input/serio/olpc_apsp.c
@@ -145,8 +145,15 @@ static int olpc_apsp_open(struct serio *port)
 {
        struct olpc_apsp *priv = port->port_data;
        unsigned int tmp;
+       unsigned long l;
 
        if (priv->open_count++ == 0) {
+               l = readl(priv->base + COMMAND_FIFO_STATUS);
+               if (!(l & CMD_STS_MASK)) {
+                       dev_err(priv->dev, "SP cannot accept commands.\n");
+                       return -EIO;
+               }
+
                /* Enable interrupt 0 by clearing its bit */
                tmp = readl(priv->base + PJ_INTERRUPT_MASK);
                writel(tmp & ~INT_0, priv->base + PJ_INTERRUPT_MASK);
@@ -172,15 +179,14 @@ static int olpc_apsp_probe(struct platform_device *pdev)
        struct serio *kb_serio, *pad_serio;
        struct olpc_apsp *priv;
        struct resource *res;
-       struct device_node *np;
-       unsigned long l;
        int error;
 
        priv = devm_kzalloc(&pdev->dev, sizeof(struct olpc_apsp), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
 
-       np = pdev->dev.of_node;
+       priv->dev = &pdev->dev;
+
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        priv->base = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(priv->base)) {
@@ -192,12 +198,6 @@ static int olpc_apsp_probe(struct platform_device *pdev)
        if (priv->irq < 0)
                return priv->irq;
 
-       l = readl(priv->base + COMMAND_FIFO_STATUS);
-       if (!(l & CMD_STS_MASK)) {
-               dev_err(&pdev->dev, "SP cannot accept commands.\n");
-               return -EIO;
-       }
-
        /* KEYBOARD */
        kb_serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
        if (!kb_serio)
@@ -236,7 +236,6 @@ static int olpc_apsp_probe(struct platform_device *pdev)
                goto err_irq;
        }
 
-       priv->dev = &pdev->dev;
        device_init_wakeup(priv->dev, 1);
        platform_set_drvdata(pdev, priv);