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/video/imx-ipu-fb.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/video/imx-ipu-fb.c')
-rw-r--r-- | drivers/video/imx-ipu-fb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c index abac812cb6..a69df50811 100644 --- a/drivers/video/imx-ipu-fb.c +++ b/drivers/video/imx-ipu-fb.c @@ -1001,6 +1001,8 @@ static int imxfb_probe(struct device_d *dev) return PTR_ERR(fbi->clk); fbi->regs = dev_request_mem_region(dev, 0); + if (IS_ERR(fbi->regs)) + return PTR_ERR(fbi->regs); fbi->dev = dev; fbi->enable = pdata->enable; fbi->disp_data_fmt = pdata->disp_data_fmt; |