Unverified Commit 977ad51f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7993 HID: i2c-hid: remove I2C_HID_READ_PENDING flag to prevent lock-up 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yang Yingliang <yangyingliang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/GYK7LD6BEDZSXR25PPZZHZLJ63EFC6Q2/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9QRN6 
 
Link:https://gitee.com/openeuler/kernel/pulls/7993

 

Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents da5320e4 df17fc2b

drivers/hid/i2c-hid/i2c-hid-core.c

+0 −8
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ 
/* flags */

#define I2C_HID_STARTED		0

#define I2C_HID_RESET_PENDING	1

#define I2C_HID_READ_PENDING	2



#define I2C_HID_PWR_ON		0x00

#define I2C_HID_PWR_SLEEP	0x01
@@ -256,7 +255,6 @@ static int __i2c_hid_command(struct i2c_client *client, 
		msg[1].len = data_len;

		msg[1].buf = buf_recv;

		msg_num = 2;

		set_bit(I2C_HID_READ_PENDING, &ihid->flags);

	}



	if (wait)
@@ -264,9 +262,6 @@ static int __i2c_hid_command(struct i2c_client *client, 


	ret = i2c_transfer(client->adapter, msg, msg_num);



	if (data_len > 0)

		clear_bit(I2C_HID_READ_PENDING, &ihid->flags);



	if (ret != msg_num)

		return ret < 0 ? ret : -EIO;
@@ -538,9 +533,6 @@ static irqreturn_t i2c_hid_irq(int irq, void *dev_id) 
{

	struct i2c_hid *ihid = dev_id;



	if (test_bit(I2C_HID_READ_PENDING, &ihid->flags))

		return IRQ_HANDLED;



	i2c_hid_get_input(ihid);



	return IRQ_HANDLED;