Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 320016
b: refs/heads/master
c: c799cfc
h: refs/heads/master
v: v3
  • Loading branch information
Daniel Glöckner authored and Mauro Carvalho Chehab committed Jun 18, 2012
1 parent f3a2206 commit 902b740
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 00fb18503fee608beee5fb11cb8a6db8533e7e86
refs/heads/master: c799cfc57c98e603f62f1d79d48ff4418c99f6d6
3 changes: 0 additions & 3 deletions trunk/drivers/media/video/tvaudio.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ struct CHIPSTATE {
/* thread */
struct task_struct *thread;
struct timer_list wt;
int watch_stereo;
int audmode;
};

Expand Down Expand Up @@ -1741,7 +1740,6 @@ static int tvaudio_s_radio(struct v4l2_subdev *sd)
struct CHIPSTATE *chip = to_state(sd);

chip->radio = 1;
chip->watch_stereo = 0;
/* del_timer(&chip->wt); */
return 0;
}
Expand Down Expand Up @@ -1821,7 +1819,6 @@ static int tvaudio_s_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
chip->audmode = vt->audmode;

if (mode) {
chip->watch_stereo = 0;
/* del_timer(&chip->wt); */
chip->mode = mode;
desc->setmode(chip, mode);
Expand Down

0 comments on commit 902b740

Please sign in to comment.