summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChangbing Xiong <cb.xiong@samsung.com>2014-08-20 23:05:07 -0300
committerChanho Park <chanho61.park@samsung.com>2014-11-18 12:00:43 +0900
commitc240ddd14071fbf6de3c439daf64ccca87b5e6a6 (patch)
treef92509b73a17bbb1292e1c31034884953bf75049
parent5b2caa4880da47ddae2a34d0e48d2c90f353913e (diff)
downloadlinux-3.10-c240ddd14071fbf6de3c439daf64ccca87b5e6a6.tar.gz
linux-3.10-c240ddd14071fbf6de3c439daf64ccca87b5e6a6.tar.bz2
linux-3.10-c240ddd14071fbf6de3c439daf64ccca87b5e6a6.zip
media: correct return value in dvb_demux_poll
Data type of return value is unsigned int, but in function of dvb_demux_poll, when the pointer of dmxdevfilter equals NULL, it will return -EINVAL, which is invalid. Change-Id: I5b0f3b6e973b2b5ea041e9ff0ea1709d109a9945 Signed-off-by: Changbing Xiong <cb.xiong@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/dvb-core/dmxdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index c0363f1b6c9..7a5c07003c4 100644
--- a/drivers/media/dvb-core/dmxdev.c
+++ b/drivers/media/dvb-core/dmxdev.c
@@ -1088,7 +1088,7 @@ static unsigned int dvb_demux_poll(struct file *file, poll_table *wait)
unsigned int mask = 0;
if (!dmxdevfilter)
- return -EINVAL;
+ return POLLERR;
poll_wait(file, &dmxdevfilter->buffer.queue, wait);