bttv: fix audio mute on device close for the video device node

Signed-off-by Frank Schäfer <[email protected]>

---
 drivers/media/pci/bt8xx/bttv-driver.c |    5 ++++-

1 Datei geändert, 4 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)

drivers/media/pci/bt8xx/bttv-driver.c +1 -0

index 2c09bc5..74977f7 100644
@@ -3227,6 +3227,7 @@ static int radio_open(struct file *file)
 	v4l2_fh_init(&fh->fh, vdev);
 
 	btv->radio_user++;
+	audio_mute(btv, btv->mute);
 
 	v4l2_fh_add(&fh->fh);
 

drivers/media/pci/bt8xx/bttv-driver.c +0 -0

 	return 0;
 }
 

Signed-off-by Frank Schäfer <[email protected]>

---
 drivers/media/pci/bt8xx/bttv-driver.c |    5 ++++-

1 Datei geändert, 4 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)

drivers/media/pci/bt8xx/bttv-driver.c +1 -0

index 2c09bc5..74977f7 100644
@@ -3227,6 +3227,7 @@ static int radio_open(struct file *file)
 	v4l2_fh_init(&fh->fh, vdev);
 
 	btv->radio_user++;
+	audio_mute(btv, btv->mute);
 
 	v4l2_fh_add(&fh->fh);
 

@@ -3248,8 +3249,10 @@ static int radio_release(struct file *file)
 

Quoted 20 lines

Signed-off-by Frank Schäfer <[email protected]>

---
 drivers/media/pci/bt8xx/bttv-driver.c |    5 ++++-

1 Datei geändert, 4 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)

drivers/media/pci/bt8xx/bttv-driver.c +1 -0

index 2c09bc5..74977f7 100644
@@ -3227,6 +3227,7 @@ static int radio_open(struct file *file)
 	v4l2_fh_init(&fh->fh, vdev);
 
 	btv->radio_user++;
+	audio_mute(btv, btv->mute);
 
 	v4l2_fh_add(&fh->fh);
 

@@ -3248,8 +3249,10 @@ static int radio_release(struct file *file)
 

drivers/media/pci/bt8xx/bttv-driver.c static int radio_release(struct file *file) · line 3258

Quoted 10 lines

drivers/media/pci/bt8xx/bttv-driver.c +3 -1

 	bttv_call_all(btv, core, ioctl, SAA6588_CMD_CLOSE, &cmd);
 
-	if (btv->radio_user == 0)
+	if (btv->radio_user == 0) {
 		btv->has_radio_tuner = 0;
+		audio_mute(btv, 1);
+	}
 	return 0;
 }
 

Sorry, but this isn't right.

You should be able to just set the radio to a frequency and then exit. Since most cards have an audio out that loops to an audio input you don't want to have to keep the radio device open.

Audio should be muted when the module is unloaded, though.

The relationship between TV and radio tuners was discussed last year. The following proposal was accepted:

------- start -----------
How to handle tuner ownership if both a video and radio node share the same tuner?

Calling S_FREQ, S_TUNER, S_MODULATOR or S_HW_FREQ_SEEK will make the filehandle the owner if possible. EBUSY is returned if someone else owns the tuner and you would need to switch the tuner mode.

Ditto for ioctls that expect a valid tuner configuration like QUERYSTD. This is likely to be driver dependent, though. Just opening a device node should not switch ownership.

G_FREQUENCY: should just return the last set frequency for radio or TV: requires that that is remembered when switching ownership. This is what happens today, so G_FREQUENCY does not have to switch ownership.

G_TUNER: the rxsubchans, signal and afc fields all require ownership of the tuner. So in principle you would want to switch ownership when G_TUNER is called. On the other hand, that would mean that calling v4l2-ctl --all -d /dev/radio0 would change tuner ownership to radio for /dev/video0. That's rather unexpected.

So just set rxsubchans, signal and afc to 0 if the device node doesn't own the tuner.

Closing a device node should not switch ownership. E.g. if nobody has a radio device open, should the tuner switch back to TV mode automatically? The answer is that it shouldn't.

How about hybrid tuners? The code to handle tuner ownership should be shared between DVB and V4L2.
----------- end --------------

All very nice, but nobody had the chance to actually work on this.

But this is how it should work.

Regards,

Hans

Am 10.03.2013 12:59, schrieb Hans Verkuil:

Quoted 33 lines · On Sun March 10 2013 12:40:35 Frank Schäfer wrote:

Quoted 20 lines

Signed-off-by Frank Schäfer <[email protected]>

---
 drivers/media/pci/bt8xx/bttv-driver.c |    5 ++++-

1 Datei geändert, 4 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)

drivers/media/pci/bt8xx/bttv-driver.c +1 -0

index 2c09bc5..74977f7 100644
@@ -3227,6 +3227,7 @@ static int radio_open(struct file *file)
 	v4l2_fh_init(&fh->fh, vdev);
 
 	btv->radio_user++;
+	audio_mute(btv, btv->mute);
 
 	v4l2_fh_add(&fh->fh);
 

@@ -3248,8 +3249,10 @@ static int radio_release(struct file *file)
 

drivers/media/pci/bt8xx/bttv-driver.c static int radio_release(struct file *file) · line 3258

Quoted 10 lines

drivers/media/pci/bt8xx/bttv-driver.c +3 -1

 	bttv_call_all(btv, core, ioctl, SAA6588_CMD_CLOSE, &cmd);
 
-	if (btv->radio_user == 0)
+	if (btv->radio_user == 0) {
 		btv->has_radio_tuner = 0;
+		audio_mute(btv, 1);
+	}
 	return 0;
 }
 

Sorry, but this isn't right.

Quoted 3 lines

You should be able to just set the radio to a frequency and then exit. Since most cards have an audio out that loops to an audio input you don't want to have to keep the radio device open.

Ok, so I will drop this patch.

AFAICS the above said also applies to the video device part, so it's still not clear to me why both devices should be handled differently. Anyway, I will regard it as a kind of "tradition".

Quoted 34 lines

Audio should be muted when the module is unloaded, though.

The relationship between TV and radio tuners was discussed last year. The following proposal was accepted:

------- start -----------
How to handle tuner ownership if both a video and radio node share the same tuner?

Calling S_FREQ, S_TUNER, S_MODULATOR or S_HW_FREQ_SEEK will make the filehandle the owner if possible. EBUSY is returned if someone else owns the tuner and you would need to switch the tuner mode.

Ditto for ioctls that expect a valid tuner configuration like QUERYSTD. This is likely to be driver dependent, though. Just opening a device node should not switch ownership.

G_FREQUENCY: should just return the last set frequency for radio or TV: requires that that is remembered when switching ownership. This is what happens today, so G_FREQUENCY does not have to switch ownership.

G_TUNER: the rxsubchans, signal and afc fields all require ownership of the tuner. So in principle you would want to switch ownership when G_TUNER is called. On the other hand, that would mean that calling v4l2-ctl --all -d /dev/radio0 would change tuner ownership to radio for /dev/video0. That's rather unexpected.

So just set rxsubchans, signal and afc to 0 if the device node doesn't own the tuner.

Closing a device node should not switch ownership. E.g. if nobody has a radio device open, should the tuner switch back to TV mode automatically? The answer is that it shouldn't.

Quoted 7 lines

How about hybrid tuners? The code to handle tuner ownership should be shared between DVB and V4L2.
----------- end --------------

All very nice, but nobody had the chance to actually work on this.

But this is how it should work.

Interesting, thanks !

Regards,
Frank

Quoted 4 lines

Regards,

Hans

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Quoted 34 lines

Am 10.03.2013 12:59, schrieb Hans Verkuil:

Quoted 33 lines · On Sun March 10 2013 12:40:35 Frank Schäfer wrote:

Quoted 20 lines

Signed-off-by Frank Schäfer <[email protected]>

---
 drivers/media/pci/bt8xx/bttv-driver.c |    5 ++++-

1 Datei geändert, 4 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)

drivers/media/pci/bt8xx/bttv-driver.c +1 -0

index 2c09bc5..74977f7 100644
@@ -3227,6 +3227,7 @@ static int radio_open(struct file *file)
 	v4l2_fh_init(&fh->fh, vdev);
 
 	btv->radio_user++;
+	audio_mute(btv, btv->mute);
 
 	v4l2_fh_add(&fh->fh);
 

@@ -3248,8 +3249,10 @@ static int radio_release(struct file *file)
 

drivers/media/pci/bt8xx/bttv-driver.c static int radio_release(struct file *file) · line 3258

Quoted 10 lines

drivers/media/pci/bt8xx/bttv-driver.c +3 -1

 	bttv_call_all(btv, core, ioctl, SAA6588_CMD_CLOSE, &cmd);
 
-	if (btv->radio_user == 0)
+	if (btv->radio_user == 0) {
 		btv->has_radio_tuner = 0;
+		audio_mute(btv, 1);
+	}
 	return 0;
 }
 

Sorry, but this isn't right.

Quoted 8 lines

Quoted 3 lines

You should be able to just set the radio to a frequency and then exit. Since most cards have an audio out that loops to an audio input you don't want to have to keep the radio device open.

Ok, so I will drop this patch.

AFAICS the above said also applies to the video device part, so it's still not clear to me why both devices should be handled differently. Anyway, I will regard it as a kind of "tradition".

It is legacy. I doubt we would design it like that today. Also note that there is generally little point in just listening to TV without actually watching it (although some people do :-) ), so it makes sense to mute the audio when you stop watching TV.

But radio has traditionally been implemented this way and we have to keep that.

Regards,

Hans

It is not tradition. Changing it would break userspace. For example, xawtv's "radio" program expects this behavior (see the "-q" and "-m" parameters).

A typical radio usage is to do:

	$ radio -f 93.7 -q

And when user is done listening to radio:

	$ radio -m

Of course, for the above to work, the user needs to have a board wired into the audio device, or with an speaker directly connected into it.

Regards,
Mauro

Am 10.03.2013 14:56, schrieb Hans Verkuil:

Quoted 48 lines · On Sun March 10 2013 14:47:48 Frank Schäfer wrote:

Quoted 34 lines

Am 10.03.2013 12:59, schrieb Hans Verkuil:

Quoted 33 lines · On Sun March 10 2013 12:40:35 Frank Schäfer wrote:

Quoted 20 lines

Signed-off-by Frank Schäfer <[email protected]>

---
 drivers/media/pci/bt8xx/bttv-driver.c |    5 ++++-

1 Datei geändert, 4 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)

drivers/media/pci/bt8xx/bttv-driver.c +1 -0

index 2c09bc5..74977f7 100644
@@ -3227,6 +3227,7 @@ static int radio_open(struct file *file)
 	v4l2_fh_init(&fh->fh, vdev);
 
 	btv->radio_user++;
+	audio_mute(btv, btv->mute);
 
 	v4l2_fh_add(&fh->fh);
 

@@ -3248,8 +3249,10 @@ static int radio_release(struct file *file)
 

drivers/media/pci/bt8xx/bttv-driver.c static int radio_release(struct file *file) · line 3258

Quoted 10 lines

drivers/media/pci/bt8xx/bttv-driver.c +3 -1

 	bttv_call_all(btv, core, ioctl, SAA6588_CMD_CLOSE, &cmd);
 
-	if (btv->radio_user == 0)
+	if (btv->radio_user == 0) {
 		btv->has_radio_tuner = 0;
+		audio_mute(btv, 1);
+	}
 	return 0;
 }
 

Sorry, but this isn't right.

Quoted 8 lines

Quoted 3 lines

You should be able to just set the radio to a frequency and then exit. Since most cards have an audio out that loops to an audio input you don't want to have to keep the radio device open.

Ok, so I will drop this patch.

AFAICS the above said also applies to the video device part, so it's still not clear to me why both devices should be handled differently. Anyway, I will regard it as a kind of "tradition".

It is legacy. I doubt we would design it like that today. Also note that there is generally little point in just listening to TV without actually watching it (although some people do :-) ), so it makes sense to mute the audio when you stop watching TV.

Quoted 7 lines

But radio has traditionally been implemented this way and we have to keep that.

Regards,

Hans

[...]

Am 10.03.2013 14:58, schrieb Mauro Carvalho Chehab:
...

Quoted 11 lines

It is not tradition. Changing it would break userspace. For example, xawtv's "radio" program expects this behavior (see the "-q" and "-m" parameters).

A typical radio usage is to do:

	$ radio -f 93.7 -q

And when user is done listening to radio:

	$ radio -m

Quoted 5 lines

Of course, for the above to work, the user needs to have a board wired into the audio device, or with an speaker directly connected into it.

Regards,
Mauro

Fair enough, thanks for your explanations. Please excuse my questions about issues like this.

Without knowing the history and the reasons for the initial design decisions it's sometimes difficult to understand why things are working as they are and if they need to be fixed.

Am 10.03.2013 12:59, schrieb Hans Verkuil:

Quoted 33 lines · On Sun March 10 2013 12:40:35 Frank Schäfer wrote:

Quoted 20 lines

Signed-off-by Frank Schäfer <[email protected]>

---
 drivers/media/pci/bt8xx/bttv-driver.c |    5 ++++-

1 Datei geändert, 4 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)

drivers/media/pci/bt8xx/bttv-driver.c +1 -0

index 2c09bc5..74977f7 100644
@@ -3227,6 +3227,7 @@ static int radio_open(struct file *file)
 	v4l2_fh_init(&fh->fh, vdev);
 
 	btv->radio_user++;
+	audio_mute(btv, btv->mute);
 
 	v4l2_fh_add(&fh->fh);
 

@@ -3248,8 +3249,10 @@ static int radio_release(struct file *file)
 

drivers/media/pci/bt8xx/bttv-driver.c static int radio_release(struct file *file) · line 3258

Quoted 10 lines

drivers/media/pci/bt8xx/bttv-driver.c +3 -1

 	bttv_call_all(btv, core, ioctl, SAA6588_CMD_CLOSE, &cmd);
 
-	if (btv->radio_user == 0)
+	if (btv->radio_user == 0) {
 		btv->has_radio_tuner = 0;
+		audio_mute(btv, 1);
+	}
 	return 0;
 }
 

Sorry, but this isn't right.

Quoted 3 lines

You should be able to just set the radio to a frequency and then exit. Since most cards have an audio out that loops to an audio input you don't want to have to keep the radio device open.

Ok, so I will drop this patch.

AFAICS the above said also applies to the video device part, so it's still not clear to me why both devices should be handled differently. Anyway, I will regard it as a kind of "tradition".

Signed-off-by Frank Schäfer <[email protected]>

---
 drivers/media/pci/bt8xx/bttv-driver.c |   22 +++++++++++-----------

1 Datei geändert, 11 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-)

drivers/media/pci/bt8xx/bttv-driver.c +9 -10

index 8610b6a..2c09bc5 100644
@@ -992,21 +992,20 @@ static char *audio_modes[] = {
 static int
 audio_mux(struct bttv *btv, int input, int mute)
 {
-	int gpio_val, signal;
+	int gpio_val, signal, mute_gpio;
 	struct v4l2_ctrl *ctrl;
 
 	gpio_inout(bttv_tvcards[btv->c.type].gpiomask,
 		   bttv_tvcards[btv->c.type].gpiomask);
 	signal = btread(BT848_DSTATUS) & BT848_DSTATUS_HLOC;
 
-	btv->mute = mute;
 	btv->audio = input;
 
 	/* automute */
-	mute = mute || (btv->opt_automute && (!signal || !btv->users)
+	mute_gpio = mute || (btv->opt_automute && (!signal || !btv->users)
 				&& !btv->has_radio_tuner);
 
-	if (mute)
+	if (mute_gpio)
 		gpio_val = bttv_tvcards[btv->c.type].gpiomute;
 	else
 		gpio_val = bttv_tvcards[btv->c.type].gpiomux[input];

@@ -1022,7 +1021,7 @@ audio_mux(struct bttv *btv, int input, int mute)
 	}
 
 	if (bttv_gpio)
-		bttv_gpio_tracking(btv, audio_modes[mute ? 4 : input]);
+		bttv_gpio_tracking(btv, audio_modes[mute_gpio ? 4 : input]);
 	if (in_interrupt())
 		return 0;
 

@@ -1031,7 +1030,7 @@ audio_mux(struct bttv *btv, int input, int mute)
 
 		ctrl = v4l2_ctrl_find(btv->sd_msp34xx->ctrl_handler, V4L2_CID_AUDIO_MUTE);
 		if (ctrl)
-			v4l2_ctrl_s_ctrl(ctrl, btv->mute);
+			v4l2_ctrl_s_ctrl(ctrl, mute);
 
 		/* Note: the inputs tuner/radio/extern/intern are translated
 		   to msp routings. This assumes common behavior for all msp3400

@@ -1080,7 +1079,7 @@ audio_mux(struct bttv *btv, int input, int mute)
 		ctrl = v4l2_ctrl_find(btv->sd_tvaudio->ctrl_handler, V4L2_CID_AUDIO_MUTE);
 
 		if (ctrl)
-			v4l2_ctrl_s_ctrl(ctrl, btv->mute);
+			v4l2_ctrl_s_ctrl(ctrl, mute);
 		v4l2_subdev_call(btv->sd_tvaudio, audio, s_routing,
 				input, 0, 0);
 	}

@@ -1088,7 +1087,7 @@ audio_mux(struct bttv *btv, int input, int mute)
 		ctrl = v4l2_ctrl_find(btv->sd_tda7432->ctrl_handler, V4L2_CID_AUDIO_MUTE);
 
 		if (ctrl)
-			v4l2_ctrl_s_ctrl(ctrl, btv->mute);
+			v4l2_ctrl_s_ctrl(ctrl, mute);
 	}
 	return 0;
 }

@@ -1300,6 +1299,7 @@ static int bttv_s_ctrl(struct v4l2_ctrl *c)
 		break;
 	case V4L2_CID_AUDIO_MUTE:
 		audio_mute(btv, c->val);
+		btv->mute = c->val;
 		break;
 	case V4L2_CID_AUDIO_VOLUME:
 		btv->volume_gpio(btv, c->val);

@@ -3062,8 +3062,7 @@ static int bttv_open(struct file *file)
 			    sizeof(struct bttv_buffer),
 			    fh, &btv->lock);
 	set_tvnorm(btv,btv->tvnorm);
-	set_input(btv, btv->input, btv->tvnorm);
-
+	set_input(btv, btv->input, btv->tvnorm); /* also (un)mutes audio */
 
 	/* The V4L2 spec requires one global set of cropping parameters
 	   which only change on request. These are stored in btv->crop[1].

drivers/media/pci/bt8xx/bttv-driver.c +1 -0

 	v4l2_fh_del(&fh->fh);
 	v4l2_fh_exit(&fh->fh);

@@ -4209,6 +4208,7 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
 	btv->std = V4L2_STD_PAL;
 	init_irqreg(btv);
 	v4l2_ctrl_handler_setup(hdl);
+	audio_mute(btv, 1);
 
 	if (hdl->error) {
 		result = hdl->error;

Signed-off-by Frank Schäfer <[email protected]>

---
 drivers/media/pci/bt8xx/bttv-driver.c |   22 +++++++++++-----------

1 Datei geändert, 11 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-)

drivers/media/pci/bt8xx/bttv-driver.c +11 -11

index 8610b6a..2c09bc5 100644
@@ -992,21 +992,20 @@ static char *audio_modes[] = {
 static int
 audio_mux(struct bttv *btv, int input, int mute)
 {
-	int gpio_val, signal;
+	int gpio_val, signal, mute_gpio;
 	struct v4l2_ctrl *ctrl;
 
 	gpio_inout(bttv_tvcards[btv->c.type].gpiomask,
 		   bttv_tvcards[btv->c.type].gpiomask);
 	signal = btread(BT848_DSTATUS) & BT848_DSTATUS_HLOC;
 
-	btv->mute = mute;
 	btv->audio = input;
 
 	/* automute */
-	mute = mute || (btv->opt_automute && (!signal || !btv->users)
+	mute_gpio = mute || (btv->opt_automute && (!signal || !btv->users)
 				&& !btv->has_radio_tuner);
 
-	if (mute)
+	if (mute_gpio)
 		gpio_val = bttv_tvcards[btv->c.type].gpiomute;
 	else
 		gpio_val = bttv_tvcards[btv->c.type].gpiomux[input];

@@ -1022,7 +1021,7 @@ audio_mux(struct bttv *btv, int input, int mute)
 	}
 
 	if (bttv_gpio)
-		bttv_gpio_tracking(btv, audio_modes[mute ? 4 : input]);
+		bttv_gpio_tracking(btv, audio_modes[mute_gpio ? 4 : input]);
 	if (in_interrupt())
 		return 0;
 

@@ -1031,7 +1030,7 @@ audio_mux(struct bttv *btv, int input, int mute)
 
 		ctrl = v4l2_ctrl_find(btv->sd_msp34xx->ctrl_handler, V4L2_CID_AUDIO_MUTE);
 		if (ctrl)
-			v4l2_ctrl_s_ctrl(ctrl, btv->mute);
+			v4l2_ctrl_s_ctrl(ctrl, mute);
 
 		/* Note: the inputs tuner/radio/extern/intern are translated
 		   to msp routings. This assumes common behavior for all msp3400

@@ -1080,7 +1079,7 @@ audio_mux(struct bttv *btv, int input, int mute)
 		ctrl = v4l2_ctrl_find(btv->sd_tvaudio->ctrl_handler, V4L2_CID_AUDIO_MUTE);
 
 		if (ctrl)
-			v4l2_ctrl_s_ctrl(ctrl, btv->mute);
+			v4l2_ctrl_s_ctrl(ctrl, mute);
 		v4l2_subdev_call(btv->sd_tvaudio, audio, s_routing,
 				input, 0, 0);
 	}

@@ -1088,7 +1087,7 @@ audio_mux(struct bttv *btv, int input, int mute)
 		ctrl = v4l2_ctrl_find(btv->sd_tda7432->ctrl_handler, V4L2_CID_AUDIO_MUTE);
 
 		if (ctrl)
-			v4l2_ctrl_s_ctrl(ctrl, btv->mute);
+			v4l2_ctrl_s_ctrl(ctrl, mute);
 	}
 	return 0;
 }

@@ -1300,6 +1299,7 @@ static int bttv_s_ctrl(struct v4l2_ctrl *c)
 		break;
 	case V4L2_CID_AUDIO_MUTE:
 		audio_mute(btv, c->val);
+		btv->mute = c->val;
 		break;
 	case V4L2_CID_AUDIO_VOLUME:
 		btv->volume_gpio(btv, c->val);

@@ -3062,8 +3062,7 @@ static int bttv_open(struct file *file)
 			    sizeof(struct bttv_buffer),
 			    fh, &btv->lock);
 	set_tvnorm(btv,btv->tvnorm);
-	set_input(btv, btv->input, btv->tvnorm);
-
+	set_input(btv, btv->input, btv->tvnorm); /* also (un)mutes audio */
 
 	/* The V4L2 spec requires one global set of cropping parameters
 	   which only change on request. These are stored in btv->crop[1].

@@ -3124,7 +3123,7 @@ static int bttv_release(struct file *file)
 	bttv_field_count(btv);
 
 	if (!btv->users)
-		audio_mute(btv, btv->mute);
+		audio_mute(btv, 1);
 
 	v4l2_fh_del(&fh->fh);
 	v4l2_fh_exit(&fh->fh);

@@ -4209,6 +4208,7 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
 	btv->std = V4L2_STD_PAL;
 	init_irqreg(btv);
 	v4l2_ctrl_handler_setup(hdl);
+	audio_mute(btv, 1);
 
 	if (hdl->error) {
 		result = hdl->error;

Quoted 1 line

Signed-off-by Frank Schäfer <[email protected]>

Could you describe exactly what bug is fixed? I tested it a fair amount when I created my bttv patches, so I'd like to know what I missed.

Regards,

Hans

Quoted 105 lines

---
 drivers/media/pci/bt8xx/bttv-driver.c |   22 +++++++++++-----------

1 Datei geändert, 11 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-)

drivers/media/pci/bt8xx/bttv-driver.c +11 -11

index 8610b6a..2c09bc5 100644
@@ -992,21 +992,20 @@ static char *audio_modes[] = {
 static int
 audio_mux(struct bttv *btv, int input, int mute)
 {
-	int gpio_val, signal;
+	int gpio_val, signal, mute_gpio;
 	struct v4l2_ctrl *ctrl;
 
 	gpio_inout(bttv_tvcards[btv->c.type].gpiomask,
 		   bttv_tvcards[btv->c.type].gpiomask);
 	signal = btread(BT848_DSTATUS) & BT848_DSTATUS_HLOC;
 
-	btv->mute = mute;
 	btv->audio = input;
 
 	/* automute */
-	mute = mute || (btv->opt_automute && (!signal || !btv->users)
+	mute_gpio = mute || (btv->opt_automute && (!signal || !btv->users)
 				&& !btv->has_radio_tuner);
 
-	if (mute)
+	if (mute_gpio)
 		gpio_val = bttv_tvcards[btv->c.type].gpiomute;
 	else
 		gpio_val = bttv_tvcards[btv->c.type].gpiomux[input];

@@ -1022,7 +1021,7 @@ audio_mux(struct bttv *btv, int input, int mute)
 	}
 
 	if (bttv_gpio)
-		bttv_gpio_tracking(btv, audio_modes[mute ? 4 : input]);
+		bttv_gpio_tracking(btv, audio_modes[mute_gpio ? 4 : input]);
 	if (in_interrupt())
 		return 0;
 

@@ -1031,7 +1030,7 @@ audio_mux(struct bttv *btv, int input, int mute)
 
 		ctrl = v4l2_ctrl_find(btv->sd_msp34xx->ctrl_handler, V4L2_CID_AUDIO_MUTE);
 		if (ctrl)
-			v4l2_ctrl_s_ctrl(ctrl, btv->mute);
+			v4l2_ctrl_s_ctrl(ctrl, mute);
 
 		/* Note: the inputs tuner/radio/extern/intern are translated
 		   to msp routings. This assumes common behavior for all msp3400

@@ -1080,7 +1079,7 @@ audio_mux(struct bttv *btv, int input, int mute)
 		ctrl = v4l2_ctrl_find(btv->sd_tvaudio->ctrl_handler, V4L2_CID_AUDIO_MUTE);
 
 		if (ctrl)
-			v4l2_ctrl_s_ctrl(ctrl, btv->mute);
+			v4l2_ctrl_s_ctrl(ctrl, mute);
 		v4l2_subdev_call(btv->sd_tvaudio, audio, s_routing,
 				input, 0, 0);
 	}

@@ -1088,7 +1087,7 @@ audio_mux(struct bttv *btv, int input, int mute)
 		ctrl = v4l2_ctrl_find(btv->sd_tda7432->ctrl_handler, V4L2_CID_AUDIO_MUTE);
 
 		if (ctrl)
-			v4l2_ctrl_s_ctrl(ctrl, btv->mute);
+			v4l2_ctrl_s_ctrl(ctrl, mute);
 	}
 	return 0;
 }

@@ -1300,6 +1299,7 @@ static int bttv_s_ctrl(struct v4l2_ctrl *c)
 		break;
 	case V4L2_CID_AUDIO_MUTE:
 		audio_mute(btv, c->val);
+		btv->mute = c->val;
 		break;
 	case V4L2_CID_AUDIO_VOLUME:
 		btv->volume_gpio(btv, c->val);

@@ -3062,8 +3062,7 @@ static int bttv_open(struct file *file)
 			    sizeof(struct bttv_buffer),
 			    fh, &btv->lock);
 	set_tvnorm(btv,btv->tvnorm);
-	set_input(btv, btv->input, btv->tvnorm);
-
+	set_input(btv, btv->input, btv->tvnorm); /* also (un)mutes audio */
 
 	/* The V4L2 spec requires one global set of cropping parameters
 	   which only change on request. These are stored in btv->crop[1].

@@ -3124,7 +3123,7 @@ static int bttv_release(struct file *file)
 	bttv_field_count(btv);
 
 	if (!btv->users)
-		audio_mute(btv, btv->mute);
+		audio_mute(btv, 1);
 
 	v4l2_fh_del(&fh->fh);
 	v4l2_fh_exit(&fh->fh);

@@ -4209,6 +4208,7 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
 	btv->std = V4L2_STD_PAL;
 	init_irqreg(btv);
 	v4l2_ctrl_handler_setup(hdl);
+	audio_mute(btv, 1);
 
 	if (hdl->error) {
 		result = hdl->error;