From 81364e6c6bb1f8bf505d3ba2f7e9e0428a53f8d2 Mon Sep 17 00:00:00 2001 From: Alexander Beregalov Date: Thu, 7 Jan 2010 03:21:48 +0300 Subject: [PATCH] --- yaml --- r: 186627 b: refs/heads/master c: c424d46fdc79df201707fe815aa8480751918025 h: refs/heads/master i: 186625: 2a0b1a9d0a36ea1cde6a3df0cd5c1d5025b890ba 186623: 664026ccf178f7f7a1d13eea4a2f11e3d25e066d v: v3 --- [refs] | 2 +- trunk/drivers/staging/cx25821/cx25821-audups11.c | 3 ++- trunk/drivers/staging/cx25821/cx25821-video.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7f259ed244c3..4f3a68a7d843 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 267c39c918cd0c239148a281d51693f47d2e1e54 +refs/heads/master: c424d46fdc79df201707fe815aa8480751918025 diff --git a/trunk/drivers/staging/cx25821/cx25821-audups11.c b/trunk/drivers/staging/cx25821/cx25821-audups11.c index 89c8fe2997fa..46c7f78bb972 100644 --- a/trunk/drivers/staging/cx25821/cx25821-audups11.c +++ b/trunk/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; diff --git a/trunk/drivers/staging/cx25821/cx25821-video.c b/trunk/drivers/staging/cx25821/cx25821-video.c index 6e710ae067ad..8cd3986d2e5c 100644 --- a/trunk/drivers/staging/cx25821/cx25821-video.c +++ b/trunk/drivers/staging/cx25821/cx25821-video.c @@ -963,10 +963,11 @@ int cx25821_set_freq(struct cx25821_dev *dev, struct v4l2_frequency *f) int vidioc_s_frequency(struct file *file, void *priv, struct v4l2_frequency *f) { 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;