video: of: display_timing: add doubleclk flag

[karo-tx-linux.git] / drivers / spi / spi-pxa2xx-pci.c

diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c
index 364964d2ed04f32a1436710a5019f7b7ccd3c261..74bc18775658667617464aa865a7fb939161c438 100644 (file)
--- a/drivers/spi/spi-pxa2xx-pci.c
+++ b/drivers/spi/spi-pxa2xx-pci.c
@@ -22,7 +22,7 @@ static int ce4100_spi_probe(struct pci_dev *dev,
                return ret;
 
        ret = pcim_iomap_regions(dev, 1 << 0, "PXA2xx SPI");
-       if (!ret)
+       if (ret)
                return ret;
 
        memset(&spi_pdata, 0, sizeof(spi_pdata));
@@ -47,8 +47,8 @@ static int ce4100_spi_probe(struct pci_dev *dev,
        pi.size_data = sizeof(spi_pdata);
 
        pdev = platform_device_register_full(&pi);
-       if (!pdev)
-               return -ENOMEM;
+       if (IS_ERR(pdev))
+               return PTR_ERR(pdev);
 
        pci_set_drvdata(dev, pdev);