diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-11 10:49:48 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-11 10:49:48 +0100 |
| commit | 690ec1804cc8acbcc1afe3cc132dfcabfc7d11d5 (patch) | |
| tree | a4b1bc34272ef576fe876b8edf9073bcc687293d /drivers/input | |
| parent | d69ea86d795aea0ad833f271f0690e5e02b8bbb6 (diff) | |
| parent | 3bd69ad077a955b469baa90d938fd83510297335 (diff) | |
| download | barebox-690ec1804cc8acbcc1afe3cc132dfcabfc7d11d5.tar.gz barebox-690ec1804cc8acbcc1afe3cc132dfcabfc7d11d5.tar.xz | |
Merge branch 'for-next/driver'
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/imx_keypad.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/input/imx_keypad.c b/drivers/input/imx_keypad.c index 000e17626b..44ff9b7856 100644 --- a/drivers/input/imx_keypad.c +++ b/drivers/input/imx_keypad.c @@ -364,6 +364,7 @@ static void imx_keypad_inhibit(struct imx_keypad *keypad) static int __init imx_keypad_probe(struct device_d *dev) { + struct resource *iores; struct imx_keypad *keypad; const struct matrix_keymap_data *keymap_data = dev->platform_data; int i, ret, row, col; @@ -371,9 +372,10 @@ static int __init imx_keypad_probe(struct device_d *dev) keypad = xzalloc(sizeof(struct imx_keypad)); keypad->dev = dev; - keypad->mmio_base = dev_request_mem_region(dev, 0); - if (IS_ERR(keypad->mmio_base)) - return PTR_ERR(keypad->mmio_base); + iores = dev_request_mem_resource(dev, 0); + if (IS_ERR(iores)) + return PTR_ERR(iores); + keypad->mmio_base = IOMEM(iores->start); ret = matrix_keypad_build_keymap(dev, keymap_data, MATRIX_ROW_SHIFT, keypad->keycodes); |