diff mbox

media: tm6000: add error handling for dvb_register_adapter

Message ID 1528691962-31010-1-git-send-email-jiazhouyang09@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Zhouyang Jia June 11, 2018, 4:39 a.m. UTC
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>
---
 drivers/media/usb/tm6000/tm6000-dvb.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Alexandre-Xavier Labonté-Lamoureux June 12, 2018, 12:19 a.m. UTC | #1
"adater" should be "adapter".

Have a nice day,
Alexandre-Xavier

On Mon, Jun 11, 2018 at 12:39 AM, Zhouyang Jia <jiazhouyang09@gmail.com> wrote:
> 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>
> ---
>  drivers/media/usb/tm6000/tm6000-dvb.c | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/drivers/media/usb/tm6000/tm6000-dvb.c b/drivers/media/usb/tm6000/tm6000-dvb.c
> index c811fc6..ff35d4b 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) {
> +               printk(KERN_ERR "tm6000: couldn't register the adater!\n");
> +               goto err;
> +       }
> +
>         dvb->adapter.priv = dev;
>
>         if (dvb->frontend) {
> --
> 2.7.4
>
diff mbox

Patch

diff --git a/drivers/media/usb/tm6000/tm6000-dvb.c b/drivers/media/usb/tm6000/tm6000-dvb.c
index c811fc6..ff35d4b 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) {
+		printk(KERN_ERR "tm6000: couldn't register the adater!\n");
+		goto err;
+	}
+
 	dvb->adapter.priv = dev;
 
 	if (dvb->frontend) {