diff options
| author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-09 22:02:07 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-09 23:32:58 -0300 |
| commit | 447698f6860746a279c8fd07344d67062f3533ef (patch) | |
| tree | 972fd87ca8ae2abe2351b8e36b100ce67593c436 | |
| parent | 4cc0093b3becffca5ad3944ceffa488e43a8a3da (diff) | |
| download | linux-3.10-447698f6860746a279c8fd07344d67062f3533ef.tar.gz linux-3.10-447698f6860746a279c8fd07344d67062f3533ef.tar.bz2 linux-3.10-447698f6860746a279c8fd07344d67062f3533ef.zip | |
au0828: fix checks if dvb is initialized
dev->dvb is always not null, as it is an area at the dev
memory. So, checking if (dev->dvb) is always true.
Instead of this stupid check, what the code wants to do is
to know if the DVB was successully registered.
Fix it by checking, instead, for dvb->frontend. It should
also be sure that this var will be NULL if the device was
not properly initialized.
Change-Id: I714b87027e254d34c0448ecb9a673ce1bd9e9e32
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
| -rw-r--r-- | drivers/media/usb/au0828/au0828-dvb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/usb/au0828/au0828-dvb.c b/drivers/media/usb/au0828/au0828-dvb.c index ee45990c0be..bc4ea5397e9 100644 --- a/drivers/media/usb/au0828/au0828-dvb.c +++ b/drivers/media/usb/au0828/au0828-dvb.c @@ -267,7 +267,7 @@ static int au0828_dvb_start_feed(struct dvb_demux_feed *feed) if (!demux->dmx.frontend) return -EINVAL; - if (dvb) { + if (dvb->frontend) { mutex_lock(&dvb->lock); dvb->start_count++; dprintk(1, "%s(), start_count: %d, stop_count: %d\n", __func__, @@ -296,7 +296,7 @@ static int au0828_dvb_stop_feed(struct dvb_demux_feed *feed) dprintk(1, "%s()\n", __func__); - if (dvb) { + if (dvb->frontend) { cancel_work_sync(&dev->restart_streaming); mutex_lock(&dvb->lock); @@ -526,8 +526,7 @@ void au0828_dvb_unregister(struct au0828_dev *dev) for (i = 0; i < URB_COUNT; i++) kfree(dev->dig_transfer_buffer[i]); } - - + dvb->frontend = NULL; } /* All the DVB attach calls go here, this function get's modified @@ -608,6 +607,7 @@ int au0828_dvb_register(struct au0828_dev *dev) if (ret < 0) { if (dvb->frontend->ops.release) dvb->frontend->ops.release(dvb->frontend); + dvb->frontend = NULL; return ret; } @@ -618,7 +618,7 @@ void au0828_dvb_suspend(struct au0828_dev *dev) { struct au0828_dvb *dvb = &dev->dvb; - if (dvb && dev->urb_streaming) { + if (dvb->frontend && dev->urb_streaming) { pr_info("stopping DVB\n"); cancel_work_sync(&dev->restart_streaming); @@ -635,7 +635,7 @@ void au0828_dvb_resume(struct au0828_dev *dev) { struct au0828_dvb *dvb = &dev->dvb; - if (dvb && dev->urb_streaming) { + if (dvb->frontend && dev->urb_streaming) { pr_info("resuming DVB\n"); au0828_set_frontend(dvb->frontend); |