diff options
author | Miroslav Slugen <thunder.mmm@gmail.com> | 2011-12-11 18:57:58 -0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-25 16:13:50 -0800 |
commit | 60dfee83be0262141968a4ee6b48786bc5767073 (patch) | |
tree | 367ac6588e8877792b035f09fdffe5db49fb1f0d /drivers/media | |
parent | c893fe01b35036f062a9c7d7f6b7fc926fc91115 (diff) |
cx23885-dvb: check if dvb_attach() succeded
commit a7c8aadad39428b64d26c3971d967f8314e2397d upstream.
Fix possible null dereference for Leadtek DTV 3200H
XC4000 tuner when no firmware file available.
Signed-off-by: Miroslav Slugen <thunder.mmm@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-dvb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c index bcb45be44bb..f0482b2d50f 100644 --- a/drivers/media/video/cx23885/cx23885-dvb.c +++ b/drivers/media/video/cx23885/cx23885-dvb.c @@ -940,6 +940,11 @@ static int dvb_register(struct cx23885_tsport *port) fe = dvb_attach(xc4000_attach, fe0->dvb.frontend, &dev->i2c_bus[1].i2c_adap, &cfg); + if (!fe) { + printk(KERN_ERR "%s/2: xc4000 attach failed\n", + dev->name); + goto frontend_detach; + } } break; case CX23885_BOARD_TBS_6920: |