From: Zhouyang Jia Date: Mon, 11 Jun 2018 04:39:20 +0000 (-0400) Subject: media: tm6000: add error handling for dvb_register_adapter X-Git-Tag: android-x86-8.1-r1~474^2~355 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e95d7c6eb94c634852eaa5ff4caf3db05b5d2e86;p=android-x86%2Fkernel.git media: tm6000: add error handling for dvb_register_adapter 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: Zhouyang Jia [hans.verkuil@cisco.com: use pr_err and fix typo: adater -> adapter] Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/usb/tm6000/tm6000-dvb.c b/drivers/media/usb/tm6000/tm6000-dvb.c index c811fc6cf48a..3a4e545c6037 100644 --- a/drivers/media/usb/tm6000/tm6000-dvb.c +++ b/drivers/media/usb/tm6000/tm6000-dvb.c @@ -266,6 +266,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) {