diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-26 16:20:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-26 16:20:56 +0100 |
| commit | 8bce7eb7de8b88ebbf65508fc3a74ee0de9e1727 (patch) | |
| tree | 743b38e9a0bf51d5595cd004f7c213301576bb9e /drivers/spi | |
| parent | 0470f68ec1d75def5ef6ce18c4c83d3caa5e4b2f (diff) | |
| parent | 2d6e75e894f355109d1f256cfdcfca9aafa90b9a (diff) | |
| download | linux-8bce7eb7de8b88ebbf65508fc3a74ee0de9e1727.tar.bz2 | |
Merge remote-tracking branch 'spi/topic/bcm2835' into spi-next
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-bcm2835.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c index 89c0b5033114..a4185e492321 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -331,10 +331,9 @@ static int bcm2835_spi_probe(struct platform_device *pdev) goto out_master_put; } - bs->regs = devm_request_and_ioremap(&pdev->dev, res); - if (!bs->regs) { - dev_err(&pdev->dev, "could not request/map memory region\n"); - err = -ENODEV; + bs->regs = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(bs->regs)) { + err = PTR_ERR(bs->regs); goto out_master_put; } |