Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27bd1497 authored by Gabriel Fernandez's avatar Gabriel Fernandez Committed by Greg Kroah-Hartman
Browse files

Input: st-keyscan - fix potential zalloc NULL dereference 



[ Upstream commit 2439d37e1bf8a34d437573c086572abe0f3f1b15 ]

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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGabriel Fernandez <gabriel.fernandez@st.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c18daf1b

drivers/input/keyboard/st-keyscan.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -153,6 +153,8 @@ static int keyscan_probe(struct platform_device *pdev) 




	input_dev->id.bustype = BUS_HOST;

	input_dev->id.bustype = BUS_HOST;





	keypad_data->input_dev = input_dev;



	error = keypad_matrix_key_parse_dt(keypad_data);

	error = keypad_matrix_key_parse_dt(keypad_data);

	if (error)

	if (error)

		return error;

		return error;
@@ -168,8 +170,6 @@ static int keyscan_probe(struct platform_device *pdev) 




	input_set_drvdata(input_dev, keypad_data);

	input_set_drvdata(input_dev, keypad_data);





	keypad_data->input_dev = input_dev;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	keypad_data->base = devm_ioremap_resource(&pdev->dev, res);

	keypad_data->base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(keypad_data->base))

	if (IS_ERR(keypad_data->base))