diff options
author | 2009-02-02 23:55:27 -0800 | |
---|---|---|
committer | 2009-02-02 23:55:27 -0800 | |
commit | fb53fde9762432d091dac209bdf4f3f850117c55 (patch) | |
tree | 607b09022b206a539cb4a924e4ef476443798252 /drivers/media/video/tda9875.c | |
parent | dca: redesign locks to fix deadlocks (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 (diff) | |
download | linux-dev-fb53fde9762432d091dac209bdf4f3f850117c55.tar.xz linux-dev-fb53fde9762432d091dac209bdf4f3f850117c55.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/media/video/tda9875.c')
-rw-r--r-- | drivers/media/video/tda9875.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c index 56f0c0eb500f..00c6cbe06ab0 100644 --- a/drivers/media/video/tda9875.c +++ b/drivers/media/video/tda9875.c @@ -242,7 +242,7 @@ static int tda9875_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) static int tda9875_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) { struct tda9875 *t = to_state(sd); - int chvol=0, volume, balance, left, right; + int chvol = 0, volume = 0, balance = 0, left, right; switch (ctrl->id) { case V4L2_CID_AUDIO_VOLUME: |