Unverified Commit 01613b88 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12918 Input: adp5589-keys - fix NULL pointer dereference 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yi Yang <yiyang13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/IEURBU6RZSIAMA7HN56OWQUADQCRKQN6/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYR9T 
 
Link:https://gitee.com/openeuler/kernel/pulls/12918

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents bc209711 65d6fa34

drivers/input/keyboard/adp5589-keys.c

+3 −6
Original line number Diff line number Diff line
@@ -936,10 +936,9 @@ static int adp5589_keypad_add(struct adp5589_kpad *kpad, unsigned int revid) 


static void adp5589_clear_config(void *data)

{

	struct i2c_client *client = data;

	struct adp5589_kpad *kpad = i2c_get_clientdata(client);

	struct adp5589_kpad *kpad = data;



	adp5589_write(client, kpad->var->reg(ADP5589_GENERAL_CFG), 0);

	adp5589_write(kpad->client, kpad->var->reg(ADP5589_GENERAL_CFG), 0);

}



static int adp5589_probe(struct i2c_client *client)
@@ -983,7 +982,7 @@ static int adp5589_probe(struct i2c_client *client) 
	}



	error = devm_add_action_or_reset(&client->dev, adp5589_clear_config,

					 client);

					 kpad);

	if (error)

		return error;
@@ -1010,8 +1009,6 @@ static int adp5589_probe(struct i2c_client *client) 
	if (error)

		return error;



	i2c_set_clientdata(client, kpad);



	dev_info(&client->dev, "Rev.%d keypad, irq %d\n", revid, client->irq);

	return 0;

}