Commit 34a81888 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: pulse8-cec: INIT_DELAYED_WORK was called too late 



If earlier in the connect() an error occurred, then pulse8_cec_adap_free
was called by cec_delete_adapter, and that free function tried to
cancel the ping_eeprom_work workqueue, but that workqueue hasn't
been initialized yet, resulting in a kernel warning.

Move the initialization of that workqueue up to where the other
workqueues are initialized.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Fixes: 601282d6 ("media: pulse8-cec: use adap_free callback")
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent bb6d3fb3

drivers/media/usb/pulse8-cec/pulse8-cec.c

+2 −2
Original line number Diff line number Diff line
@@ -840,6 +840,8 @@ static int pulse8_connect(struct serio *serio, struct serio_driver *drv) 
	serio_set_drvdata(serio, pulse8);

	INIT_WORK(&pulse8->irq_work, pulse8_irq_work_handler);

	INIT_WORK(&pulse8->tx_work, pulse8_tx_work_handler);

	INIT_DELAYED_WORK(&pulse8->ping_eeprom_work,

			  pulse8_ping_eeprom_work_handler);

	mutex_init(&pulse8->lock);

	spin_lock_init(&pulse8->msg_lock);

	pulse8->config_pending = false;
@@ -865,8 +867,6 @@ static int pulse8_connect(struct serio *serio, struct serio_driver *drv) 
		pulse8->restoring_config = true;

	}



	INIT_DELAYED_WORK(&pulse8->ping_eeprom_work,

			  pulse8_ping_eeprom_work_handler);

	schedule_delayed_work(&pulse8->ping_eeprom_work, PING_PERIOD);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE