Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8970e5f authored by David Ellingsworth's avatar David Ellingsworth Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13071): radio-mr800: preserve radio state during suspend/resume 



Preserve radio state during suspend/resume.

Signed-off-by: default avatarDavid Ellingsworth <david@identd.dyndns.org>
Acked-by: default avatarAlexey Klimov <klimov.linux@gmail.com>
Signed-off-by: default avatarDouglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 30dd4508

drivers/media/radio/radio-mr800.c

+28 −5
Original line number Original line Diff line number Diff line
@@ -574,9 +574,12 @@ static int usb_amradio_suspend(struct usb_interface *intf, pm_message_t message) 




	mutex_lock(&radio->lock);

	mutex_lock(&radio->lock);





	if (!radio->muted && radio->initialized) {

		retval = amradio_set_mute(radio, AMRADIO_STOP);

		retval = amradio_set_mute(radio, AMRADIO_STOP);

		if (retval < 0)

		if (retval < 0)

			dev_warn(&intf->dev, "amradio_stop failed\n");

			dev_warn(&intf->dev, "amradio_stop failed\n");

		radio->muted = 0;

	}





	dev_info(&intf->dev, "going into suspend..\n");

	dev_info(&intf->dev, "going into suspend..\n");
@@ -592,10 +595,30 @@ static int usb_amradio_resume(struct usb_interface *intf) 




	mutex_lock(&radio->lock);

	mutex_lock(&radio->lock);





	if (unlikely(!radio->initialized))

		goto unlock;



	if (radio->stereo)

		retval = amradio_set_stereo(radio, WANT_STEREO);

	else

		retval = amradio_set_stereo(radio, WANT_MONO);



	if (retval < 0)

		amradio_dev_warn(&radio->videodev.dev, "set stereo failed\n");



	retval = amradio_setfreq(radio, radio->curfreq);

	if (retval < 0)

		amradio_dev_warn(&radio->videodev.dev,

			"set frequency failed\n");



	if (!radio->muted) {

		retval = amradio_set_mute(radio, AMRADIO_START);

		retval = amradio_set_mute(radio, AMRADIO_START);

		if (retval < 0)

		if (retval < 0)

		dev_warn(&intf->dev, "amradio_start failed\n");

			dev_warn(&radio->videodev.dev,

				"amradio_start failed\n");

	}





unlock:

	dev_info(&intf->dev, "coming out of suspend..\n");

	dev_info(&intf->dev, "coming out of suspend..\n");





	mutex_unlock(&radio->lock);

	mutex_unlock(&radio->lock);