diff options
| author | Gabriel Fernandez <gabriel.fernandez@st.com> | 2019-02-16 21:10:16 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-02-16 21:44:02 -0800 |
| commit | 2439d37e1bf8a34d437573c086572abe0f3f1b15 (patch) | |
| tree | 41046ff365a6ead767c95ba30f68588443e4b89e /drivers/input/keyboard/st-keyscan.c | |
| parent | 1cd48dc51857899e8fb28dd45d4b936c94ea1dab (diff) | |
| download | lwn-2439d37e1bf8a34d437573c086572abe0f3f1b15.tar.gz lwn-2439d37e1bf8a34d437573c086572abe0f3f1b15.zip | |
Input: st-keyscan - fix potential zalloc NULL dereference
This patch fixes the following static checker warning:
drivers/input/keyboard/st-keyscan.c:156 keyscan_probe()
error: potential zalloc NULL dereference: 'keypad_data->input_dev'
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/keyboard/st-keyscan.c')
| -rw-r--r-- | drivers/input/keyboard/st-keyscan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/st-keyscan.c b/drivers/input/keyboard/st-keyscan.c index babcfb165e4f..3b85631fde91 100644 --- a/drivers/input/keyboard/st-keyscan.c +++ b/drivers/input/keyboard/st-keyscan.c @@ -153,6 +153,8 @@ static int keyscan_probe(struct platform_device *pdev) input_dev->id.bustype = BUS_HOST; + keypad_data->input_dev = input_dev; + error = keypad_matrix_key_parse_dt(keypad_data); if (error) return error; @@ -168,8 +170,6 @@ static int keyscan_probe(struct platform_device *pdev) input_set_drvdata(input_dev, keypad_data); - keypad_data->input_dev = input_dev; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); keypad_data->base = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(keypad_data->base)) |