V4L/DVB (13071): radio-mr800: preserve radio state during suspend/resume
Preserve radio state during suspend/resume.
Signed-off-by: David Ellingsworth <david@identd.dyndns.org>
Acked-by: Alexey Klimov <klimov.linux@gmail.com>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index 9764eca..ac21073 100644
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -574,9 +574,12 @@
mutex_lock(&radio->lock);
- retval = amradio_set_mute(radio, AMRADIO_STOP);
- if (retval < 0)
- dev_warn(&intf->dev, "amradio_stop failed\n");
+ if (!radio->muted && radio->initialized) {
+ retval = amradio_set_mute(radio, AMRADIO_STOP);
+ if (retval < 0)
+ dev_warn(&intf->dev, "amradio_stop failed\n");
+ radio->muted = 0;
+ }
dev_info(&intf->dev, "going into suspend..\n");
@@ -592,10 +595,30 @@
mutex_lock(&radio->lock);
- retval = amradio_set_mute(radio, AMRADIO_START);
- if (retval < 0)
- dev_warn(&intf->dev, "amradio_start failed\n");
+ 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);
+ if (retval < 0)
+ dev_warn(&radio->videodev.dev,
+ "amradio_start failed\n");
+ }
+
+unlock:
dev_info(&intf->dev, "coming out of suspend..\n");
mutex_unlock(&radio->lock);