aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/pvrusb2
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-22 13:02:36 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-23 07:20:07 -0300
commit19409c8969380ec42e07e5ac2d29d4a33bea572d (patch)
tree86d17b9f587c36a3a988104bead007742bc52692 /drivers/media/usb/pvrusb2
parent[media] media_device: move allocation out of media_device_*_init (diff)
downloadlinux-dev-19409c8969380ec42e07e5ac2d29d4a33bea572d.tar.xz
linux-dev-19409c8969380ec42e07e5ac2d29d4a33bea572d.zip
[media] pvrusb2-io: no need to check if sp is not NULL
The buffer_complete() routine assumes that sp is not NULL, otherwise it will fail completely. Btw, this is also assumed at pvr2_buffer_queue(), with is the routine that setups the URB handling. So, remove the bogus for the callback at buffer_complete. This fix this smatch warning: drivers/media/usb/pvrusb2/pvrusb2-io.c:476 buffer_complete() warn: variable dereferenced before check 'sp' (see line 472) Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/pvrusb2')
-rw-r--r--drivers/media/usb/pvrusb2/pvrusb2-io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-io.c b/drivers/media/usb/pvrusb2/pvrusb2-io.c
index d860344de84e..e68ce24f27e3 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-io.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-io.c
@@ -473,7 +473,7 @@ static void buffer_complete(struct urb *urb)
}
spin_unlock_irqrestore(&sp->list_lock,irq_flags);
pvr2_buffer_set_ready(bp);
- if (sp && sp->callback_func) {
+ if (sp->callback_func) {
sp->callback_func(sp->callback_data);
}
}