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

Commit f2286545 authored by Zhouyang Jia's avatar Zhouyang Jia Committed by Greg Kroah-Hartman
Browse files

media: tm6000: add error handling for dvb_register_adapter 



[ Upstream commit e95d7c6eb94c634852eaa5ff4caf3db05b5d2e86 ]

When dvb_register_adapter fails, the lack of error-handling code may
cause unexpected results.

This patch adds error-handling code after calling dvb_register_adapter.

Signed-off-by: default avatarZhouyang Jia <jiazhouyang09@gmail.com>
[hans.verkuil@cisco.com: use pr_err and fix typo: adater -> adapter]
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7376ca3d

drivers/media/usb/tm6000/tm6000-dvb.c

+5 −0
Original line number Diff line number Diff line
@@ -275,6 +275,11 @@ static int register_dvb(struct tm6000_core *dev) 


	ret = dvb_register_adapter(&dvb->adapter, "Trident TVMaster 6000 DVB-T",

					THIS_MODULE, &dev->udev->dev, adapter_nr);

	if (ret < 0) {

		pr_err("tm6000: couldn't register the adapter!\n");

		goto err;

	}



	dvb->adapter.priv = dev;



	if (dvb->frontend) {