diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-28 17:50:05 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-28 17:50:05 +1100 |
| commit | 9c8ec0bea7f4fa59b33caef310a111afc3837706 (patch) | |
| tree | f10578c1a1ad93678ee026370e3e5527d1510bc7 /drivers/staging/cx25821/cx25821-audups11.c | |
| parent | 214d2380d09c4cea02d6af9086393fa6be7c6b70 (diff) | |
| parent | 130a8a53b3bb96ec6ba007bf591befa28a71a58e (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/sm7xx/smtc2d.c
drivers/staging/sm7xx/smtc2d.h
Diffstat (limited to 'drivers/staging/cx25821/cx25821-audups11.c')
| -rw-r--r-- | drivers/staging/cx25821/cx25821-audups11.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/cx25821/cx25821-audups11.c b/drivers/staging/cx25821/cx25821-audups11.c index 89c8fe2997fa..46c7f78bb972 100644 --- 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; |