Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[cascardo/linux.git] / drivers / staging / cx25821 / cx25821-audups11.c

diff --git a/drivers/staging/cx25821/cx25821-audups11.c b/drivers/staging/cx25821/cx25821-audups11.c
index 89c8fe2..46c7f78 100644 (file)
--- a/drivers/staging/cx25821/cx25821-audups11.c
+++ b/drivers/staging/cx25821/cx25821-audups11.c
@@ -343,10 +343,11 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
                         struct v4l2_control *ctl)
 {
        struct cx25821_fh *fh = priv;
-       struct cx25821_dev *dev = fh->dev;
+       struct cx25821_dev *dev;
        int err;
 
        if (fh) {
+               dev = fh->dev;
                err = v4l2_prio_check(&dev->prio, &fh->prio);
                if (0 != err)
                        return err;