[media] lirc_dev: merge three if statements in only one

[karo-tx-linux.git] / drivers / media / rc / lirc_dev.c

diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index a8a5116d96691f0da106043d4e309ccac3e04d32..71ff82028c80583721d8b7325f91eb19dde5bac3 100644 (file)
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -270,15 +270,10 @@ static int lirc_allocate_driver(struct lirc_driver *d)
                        dev_err(d->dev, "add_to_buf not set\n");
                        return -EBADRQC;
                }
-       } else if (!(d->fops && d->fops->read) && !d->rbuf) {
-               dev_err(d->dev, "fops->read and rbuf are NULL!\n");
+       } else if (!d->rbuf && !(d->fops && d->fops->read &&
+                               d->fops->poll && d->fops->unlocked_ioctl)) {
+               dev_err(d->dev, "undefined read, poll, ioctl\n");
                return -EBADRQC;
-       } else if (!d->rbuf) {
-               if (!(d->fops && d->fops->read && d->fops->poll &&
-                     d->fops->unlocked_ioctl)) {
-                       dev_err(d->dev, "undefined read, poll, ioctl\n");
-                       return -EBADRQC;
-               }
        }
 
        mutex_lock(&lirc_dev_lock);