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/input | |
| 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/input')
| -rw-r--r-- | drivers/input/imx_keypad.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/imx_keypad.c b/drivers/input/imx_keypad.c index f220d85c7e..331eadd75f 100644 --- a/drivers/input/imx_keypad.c +++ b/drivers/input/imx_keypad.c @@ -47,6 +47,7 @@ #include <kfifo.h> #include <malloc.h> #include <matrix_keypad.h> +#include <linux/err.h> /* * Keypad Controller registers (halfword) @@ -401,6 +402,8 @@ static int __init imx_keypad_probe(struct device_d *dev) keypad->dev = dev; keypad->mmio_base = dev_request_mem_region(dev, 0); + if (IS_ERR(keypad->mmio_base)) + return PTR_ERR(keypad->mmio_base); if(!keypad->fifo_size) keypad->fifo_size = 50; |