diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
commit | fa93e4fb602389c5a5d6991a86cf93ae6e92d016 (patch) | |
tree | 570dc8a12e7410fb1f87ddb473ad5a5e64240846 /drivers/mci/atmel_mci.c | |
parent | 52a0febb3dbe06e233f04d5c670fd662b85c1d95 (diff) | |
parent | d5a82eb095def58f3a19127bb08ff96d799b63a5 (diff) | |
download | barebox-fa93e4fb602389c5a5d6991a86cf93ae6e92d016.tar.gz barebox-fa93e4fb602389c5a5d6991a86cf93ae6e92d016.tar.xz |
Merge branch 'for-next/resource-err-ptr'
Diffstat (limited to 'drivers/mci/atmel_mci.c')
-rw-r--r-- | drivers/mci/atmel_mci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mci/atmel_mci.c b/drivers/mci/atmel_mci.c index b36fbe3f97..10e769ea13 100644 --- a/drivers/mci/atmel_mci.c +++ b/drivers/mci/atmel_mci.c @@ -573,6 +573,8 @@ static int atmci_probe(struct device_d *hw_dev) host->slot_b = pd->slot_b; host->regs = dev_request_mem_region(hw_dev, 0); + if (IS_ERR(host->regs)) + return PTR_ERR(host->regs); host->hw_dev = hw_dev; hw_dev->priv = host; host->clk = clk_get(hw_dev, "mci_clk"); |