diff options
| author | Steven Toth <stoth@hauppauge.com> | 2008-04-02 01:10:40 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 14:09:43 -0300 |
| commit | 9c26de555dd3c2cb9833b4d324150aa6b5547b91 (patch) | |
| tree | 0a4a3ad4be8627c369a4e27921567942a6d0d519 | |
| parent | c32d4d7510ae4da4e83bbd6e6471b04e9c9108ea (diff) | |
| download | blackbird-op-linux-9c26de555dd3c2cb9833b4d324150aa6b5547b91.tar.gz blackbird-op-linux-9c26de555dd3c2cb9833b4d324150aa6b5547b91.zip | |
V4L/DVB (7624): Avoid an oops if the board is not fully defined
Avoid an oops if the board is not fully defined.
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | drivers/media/video/au0828/au0828-core.c | 1 | ||||
| -rw-r--r-- | drivers/media/video/au0828/au0828-dvb.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/video/au0828/au0828-core.c b/drivers/media/video/au0828/au0828-core.c index f5df99ea3b9f..a3410fc8f5f9 100644 --- a/drivers/media/video/au0828/au0828-core.c +++ b/drivers/media/video/au0828/au0828-core.c @@ -217,6 +217,7 @@ static int au0828_usb_probe (struct usb_interface *interface, au0828_dvb_register(dev); _info("Registered device AU0828 [%s]\n", + au0828_boards[dev->board].name == NULL ? "Unset" : au0828_boards[dev->board].name); return 0; diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c index 3c8a29eafc2d..ecc08a8e31ca 100644 --- a/drivers/media/video/au0828/au0828-dvb.c +++ b/drivers/media/video/au0828/au0828-dvb.c @@ -57,6 +57,9 @@ static void urb_completion(struct urb *purb) struct au0828_dev *dev = purb->context; int ptype = usb_pipetype(purb->pipe); + if (!dev) + return; + if (dev->urb_streaming == 0) return; @@ -310,6 +313,9 @@ void au0828_dvb_unregister(struct au0828_dev *dev) { struct au0828_dvb *dvb = &dev->dvb; + if(dvb->frontend == NULL) + return; + dvb_net_release(&dvb->net); dvb->demux.dmx.remove_frontend(&dvb->demux.dmx, &dvb->fe_mem); dvb->demux.dmx.remove_frontend(&dvb->demux.dmx, &dvb->fe_hw); |
