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

!8798 hid: cp2112: Fix duplicate workqueue initialization 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yuan Can <yuancan@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/45K57UVLNYADEPI4HY7TW5W7ODPSN4RJ/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9RFR6 
 
Link:https://gitee.com/openeuler/kernel/pulls/8798

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents ac851af3 a3b53563

drivers/hid/hid-cp2112.c

+2 −2
Original line number Diff line number Diff line
@@ -1158,8 +1158,6 @@ static unsigned int cp2112_gpio_irq_startup(struct irq_data *d) 
	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct cp2112_device *dev = gpiochip_get_data(gc);



	INIT_DELAYED_WORK(&dev->gpio_poll_worker, cp2112_gpio_poll_callback);



	if (!dev->gpio_poll) {

		dev->gpio_poll = true;

		schedule_delayed_work(&dev->gpio_poll_worker, 0);
@@ -1343,6 +1341,8 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	dev->gc.can_sleep		= 1;

	dev->gc.parent			= &hdev->dev;



	INIT_DELAYED_WORK(&dev->gpio_poll_worker, cp2112_gpio_poll_callback);



	ret = gpiochip_add_data(&dev->gc, dev);

	if (ret < 0) {

		hid_err(hdev, "error registering gpio chip\n");