2 files changed, 6 insertions, 3 deletions

diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index 65d69665f1fc..6a32680dbb1b 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -79,6 +79,10 @@ static int dvb_device_open(struct inode *inode, struct file *file)
                 file->private_data = dvbdev;
                 old_fops = file->f_op;
                 file->f_op = fops_get(dvbdev->fops);
+                if (file->f_op == NULL) {
+                        file->f_op = old_fops;
+                        goto fail;
+                }
                 if(file->f_op->open)
                         err = file->f_op->open(inode,file);
                 if (err) {
@@ -90,6 +94,7 @@ static int dvb_device_open(struct inode *inode, struct file *file)
                 unlock_kernel();
                 return err;
         }
+fail:
         up_read(&minor_rwsem);
         unlock_kernel();
         return -ENODEV;
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index d450cab20be4..b617bf05e2d7 100644
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
@@ -203,7 +203,6 @@ static int poll_one(struct file *file, struct poll_wqueues *pwq)
         table = &pwq->pt;
         for (;;) {
                 int mask;
-                set_current_state(TASK_INTERRUPTIBLE);
                 mask = file->f_op->poll(file, table);
                 if (mask & POLLIN)
                         break;
@@ -212,9 +211,8 @@ static int poll_one(struct file *file, struct poll_wqueues *pwq)
                         retval = -ERESTARTSYS;
                         break;
                 }
-                schedule();
+                poll_schedule(pwq, TASK_INTERRUPTIBLE);
         }
-        set_current_state(TASK_RUNNING);
         poll_freewait(pwq);
         return retval;
 }