diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-31 10:38:08 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-09-16 08:32:10 +0200 |
| commit | ed6e965824303255cacc1c1a195d3684caa26bce (patch) | |
| tree | 26e2b1b78498675ceae4dd2e990836c26ec1d5ec /drivers/mci/mci-bcm2835.c | |
| parent | 5bdc82c54a3306f2ae151a00f2df54f9240395b8 (diff) | |
| download | barebox-ed6e965824303255cacc1c1a195d3684caa26bce.tar.gz barebox-ed6e965824303255cacc1c1a195d3684caa26bce.tar.xz | |
resource: Let dev_request_mem_region return an error pointer
For all users fix or add the error check.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mci/mci-bcm2835.c')
| -rw-r--r-- | drivers/mci/mci-bcm2835.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mci/mci-bcm2835.c b/drivers/mci/mci-bcm2835.c index 7d8997c04c..59c667f5c9 100644 --- a/drivers/mci/mci-bcm2835.c +++ b/drivers/mci/mci-bcm2835.c @@ -35,6 +35,7 @@ #include <malloc.h> #include <clock.h> #include <linux/clk.h> +#include <linux/err.h> #include "mci-bcm2835.h" #include "sdhci.h" @@ -505,9 +506,9 @@ static int bcm2835_mci_probe(struct device_d *hw_dev) host->hw_dev = hw_dev; host->max_clock = clk_get_rate(clk); host->regs = dev_request_mem_region(hw_dev, 0); - if (host->regs == NULL) { + if (IS_ERR(host->regs)) { dev_err(host->hw_dev, "Failed request mem region, aborting...\n"); - return -EBUSY; + return PTR_ERR(host->regs); } host->mci.host_caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED | |