We have to check pointer for NULL and then dereference it.

Signed-off-by: Andy Shevchenko <andy.shevche...@gmail.com>
---
 drivers/media/rc/lirc_dev.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index 1e0545a..4de0e85 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -553,14 +553,14 @@ unsigned int lirc_dev_fop_poll(struct file *file, 
poll_table *wait)
        if (!ir->attached)
                return POLLERR;
 
-       poll_wait(file, &ir->buf->wait_poll, wait);
+       if (ir->buf) {
+               poll_wait(file, &ir->buf->wait_poll, wait);
 
-       if (ir->buf)
                if (lirc_buffer_empty(ir->buf))
                        ret = 0;
                else
                        ret = POLLIN | POLLRDNORM;
-       else
+       } else
                ret = POLLERR;
 
        dev_dbg(ir->d.dev, LOGHEAD "poll result = %d\n",
-- 
1.8.3.101.g727a46b

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to