Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e55677b9 authored by Colin Ian King's avatar Colin Ian King Committed by Greg Kroah-Hartman
Browse files

staging: most: video: fix registration of an empty comp core_component 



[ Upstream commit 1f447e51c0b9e8beeec0917ea5f51930f55e17c9 ]

Currently we have structrues comp (which is empty) and comp_info being
used to register and deregister the component.  This mismatch in naming
occurred from a previous commit that renamed aim_info to comp. Fix this
to use consistent component naming in line with most/net, most/sound etc.

This fixes the message two issues, one with a null empty name when
loading the module:

[ 1485.269515] most_core: registered new core component (null)

and an Oops when removing the module:

[ 1485.277971] BUG: unable to handle kernel NULL pointer dereference at 0000000000000008
[ 1485.278648] PGD 0 P4D 0
[ 1485.279253] Oops: 0002 [#2] SMP PTI
[ 1485.279847] CPU: 1 PID: 32629 Comm: modprobe Tainted: P      D WC OE     4.18.0-8-generic #9
[ 1485.280442] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 0.0.0 02/06/2015
[ 1485.281040] RIP: 0010:most_deregister_component+0x3c/0x70 [most_core]
.. etc

Fixes: 1b10a031 ("staging: most: video: remove aim designators")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3b6ff8eb

drivers/staging/most/video/video.c

+2 −2
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ static int comp_disconnect_channel(struct most_interface *iface, 
	return 0;

}



static struct core_component comp_info = {

static struct core_component comp = {

	.name = "video",

	.probe_channel = comp_probe_channel,

	.disconnect_channel = comp_disconnect_channel,
@@ -565,7 +565,7 @@ static void __exit comp_exit(void) 
	}

	spin_unlock_irq(&list_lock);



	most_deregister_component(&comp_info);

	most_deregister_component(&comp);

	BUG_ON(!list_empty(&video_devices));

}