Merge remote-tracking branch 'spi/fix/dspi' into spi-linus

5acb8bb4 · Mark Brown · a19be58c · 272bfbd5 · 5acb8bb4
Commit 5acb8bb4 authored Oct 07, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 8 deletions

drivers/spi/spi-fsl-dspi.c drivers/spi/spi-fsl-dspi.c +2 -8

No files found.
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -476,15 +476,9 @@ static int dspi_probe(struct platform_device *pdev)
 	master->bus_num = bus_num;
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!res) {
-		dev_err(&pdev->dev, "can't get platform resource\n");
-		ret = -EINVAL;
-		goto out_master_put;
-	}
 	dspi->base = devm_ioremap_resource(&pdev->dev, res);
-	if (!dspi->base) {
+	if (IS_ERR(dspi->base)) {
-		ret = -EINVAL;
+		ret = PTR_ERR(dspi->base);
 		goto out_master_put;
 	}