Commit 5b53c0e7 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-6.16/corsair' into for-linus

parents 6f965989 cc2c611f

drivers/hid/hid-corsair-void.c

+2 −2
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static void corsair_void_status_work_handler(struct work_struct *work) 
	struct delayed_work *delayed_work;

	int battery_ret;



	delayed_work = container_of(work, struct delayed_work, work);

	delayed_work = to_delayed_work(work);

	drvdata = container_of(delayed_work, struct corsair_void_drvdata,

			       delayed_status_work);
@@ -525,7 +525,7 @@ static void corsair_void_firmware_work_handler(struct work_struct *work) 
	struct delayed_work *delayed_work;

	int firmware_ret;



	delayed_work = container_of(work, struct delayed_work, work);

	delayed_work = to_delayed_work(work);

	drvdata = container_of(delayed_work, struct corsair_void_drvdata,

			       delayed_firmware_work);