diff options
| author | Tejun Heo <tj@kernel.org> | 2009-07-04 07:13:18 +0900 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-07-04 07:13:18 +0900 |
| commit | c43768cbb7655ea5ff782ae250f6e2ef4297cf98 (patch) | |
| tree | 3982e41dde3eecaa3739a5d1a8ed18d04bd74f01 /drivers/media/video/gspca/gspca.c | |
| parent | 1a8dd307cc0a2119be4e578c517795464e6dabba (diff) | |
| parent | 746a99a5af60ee676afa2ba469ccd1373493c7e7 (diff) | |
| download | blackbird-op-linux-c43768cbb7655ea5ff782ae250f6e2ef4297cf98.tar.gz blackbird-op-linux-c43768cbb7655ea5ff782ae250f6e2ef4297cf98.zip | |
Merge branch 'master' into for-next
Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix
changes. As alpha in percpu tree uses 'weak' attribute instead of
inline assembly, there's no need for __used attribute.
Conflicts:
arch/alpha/include/asm/percpu.h
arch/mn10300/kernel/vmlinux.lds.S
include/linux/percpu-defs.h
Diffstat (limited to 'drivers/media/video/gspca/gspca.c')
| -rw-r--r-- | drivers/media/video/gspca/gspca.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index f7e0355ad644..1e89600986c8 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c @@ -1042,13 +1042,11 @@ static int vidioc_queryctrl(struct file *file, void *priv, for (i = 0; i < gspca_dev->sd_desc->nctrls; i++) { if (gspca_dev->ctrl_dis & (1 << i)) continue; - if (ctrls->qctrl.id < id) + if (gspca_dev->sd_desc->ctrls[i].qctrl.id < id) continue; - if (ctrls != NULL) { - if (gspca_dev->sd_desc->ctrls[i].qctrl.id + if (ctrls && gspca_dev->sd_desc->ctrls[i].qctrl.id > ctrls->qctrl.id) - continue; - } + continue; ctrls = &gspca_dev->sd_desc->ctrls[i]; } } else { |
