diff options
| author | Pan Bian <bianpan2016@163.com> | 2017-08-14 19:29:13 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-08-15 05:23:47 +0200 |
| commit | 6ecd36d732886ecb07768432212efce9cfb6ac2f (patch) | |
| tree | 9515ec2a4d8b5e5303e83e760530086eb457d6ac /drivers/input | |
| parent | Input: mxs-lradc - do a NULL check on iores (diff) | |
| download | linux-6ecd36d732886ecb07768432212efce9cfb6ac2f.tar.xz linux-6ecd36d732886ecb07768432212efce9cfb6ac2f.zip | |
Input: mxs-lradc - use correct error check
Function devm_ioremap() will return a NULL pointer on failure. However,
in function mxs_lradc_ts_probe(), its return value is checked with
IS_ERR(), which cannot detect the exceptional case.
Signed-off-by: Pan Bian <bianpan2016@163.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/mxs-lradc-ts.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/mxs-lradc-ts.c b/drivers/input/touchscreen/mxs-lradc-ts.c index 71bf493e8b58..816f5c8c101d 100644 --- a/drivers/input/touchscreen/mxs-lradc-ts.c +++ b/drivers/input/touchscreen/mxs-lradc-ts.c @@ -633,8 +633,8 @@ static int mxs_lradc_ts_probe(struct platform_device *pdev) if (!iores) return -EINVAL; ts->base = devm_ioremap(dev, iores->start, resource_size(iores)); - if (IS_ERR(ts->base)) - return PTR_ERR(ts->base); + if (!ts->base) + return -ENOMEM; ret = of_property_read_u32(node, "fsl,lradc-touchscreen-wires", &ts_wires); |