From: Alexey Klimov <klimov.linux@gmail.com>
To: Douglas Schilling Landgraf <dougsland@gmail.com>
Cc: linux-media@vger.kernel.org
Subject: [patch review 5/6] radio-mr800: update suspend/resume procedure
Date: Sat, 08 Aug 2009 21:46:12 +0400 [thread overview]
Message-ID: <1249753572.15160.250.camel@tux.localhost> (raw)
Patch fixes suspend/resume procedure.
Signed-off-by: Alexey Klimov <klimov.linux@gmail.com>
--
diff -r 05754a500f80 linux/drivers/media/radio/radio-mr800.c
--- a/linux/drivers/media/radio/radio-mr800.c Sat Aug 08 20:06:36 2009 +0400
+++ b/linux/drivers/media/radio/radio-mr800.c Sat Aug 08 20:22:05 2009 +0400
@@ -564,11 +564,23 @@
static int usb_amradio_suspend(struct usb_interface *intf, pm_message_t message)
{
struct amradio_device *radio = usb_get_intfdata(intf);
- int retval;
- retval = amradio_set_mute(radio, AMRADIO_STOP);
- if (retval < 0)
- dev_warn(&intf->dev, "amradio_stop failed\n");
+ if (radio->status == AMRADIO_START) {
+ int retval;
+ retval = amradio_set_mute(radio, AMRADIO_STOP);
+ if (retval < 0)
+ dev_warn(&intf->dev, "amradio_stop failed\n");
+
+ /* After stopping radio status set to AMRADIO_STOP.
+ * If we want driver to start radio on resume
+ * we set status equal to AMRADIO_START.
+ * On resume we will check status and run radio if needed.
+ */
+
+ mutex_lock(&radio->lock);
+ radio->status = AMRADIO_START;
+ mutex_unlock(&radio->lock);
+ }
dev_info(&intf->dev, "going into suspend..\n");
@@ -579,11 +591,24 @@
static int usb_amradio_resume(struct usb_interface *intf)
{
struct amradio_device *radio = usb_get_intfdata(intf);
- int retval;
- retval = amradio_set_mute(radio, AMRADIO_START);
- if (retval < 0)
- dev_warn(&intf->dev, "amradio_start failed\n");
+ if (radio->status == AMRADIO_START) {
+ int retval;
+ retval = amradio_set_mute(radio, AMRADIO_START);
+ if (retval < 0)
+ dev_warn(&intf->dev, "amradio_start failed\n");
+ retval = amradio_setfreq(radio);
+ if (retval < 0)
+ dev_warn(&intf->dev,
+ "set frequency failed\n");
+
+ if (radio->stereo) {
+ retval = amradio_set_stereo(radio, WANT_STEREO);
+ if (retval < 0)
+ dev_warn(&intf->dev, "set stereo failed\n");
+ }
+
+ }
dev_info(&intf->dev, "coming out of suspend..\n");
--
Best regards, Klimov Alexey
next reply other threads:[~2009-08-08 17:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-08 17:46 Alexey Klimov [this message]
2009-08-10 21:32 ` [patch review 5/6] radio-mr800: update suspend/resume procedure David Ellingsworth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1249753572.15160.250.camel@tux.localhost \
--to=klimov.linux@gmail.com \
--cc=dougsland@gmail.com \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox