diff options
| author | Zhouyang Jia <jiazhouyang09@gmail.com> | 2018-06-11 00:39:20 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-06-28 07:54:49 -0400 |
| commit | e95d7c6eb94c634852eaa5ff4caf3db05b5d2e86 (patch) | |
| tree | 905e47ca182374b6a02aa5f4127784ab98c03e92 | |
| parent | 6c8871baebc781f27ec9ccc1324afd9802941b11 (diff) | |
| download | linux-next-e95d7c6eb94c634852eaa5ff4caf3db05b5d2e86.tar.gz | |
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 <jiazhouyang09@gmail.com>
[hans.verkuil@cisco.com: use pr_err and fix typo: adater -> adapter]
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
| -rw-r--r-- | drivers/media/usb/tm6000/tm6000-dvb.c | 5 |
1 files changed, 5 insertions, 0 deletions
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) { |