At Fri, 14 Dec 2007 13:33:22 +0100,
Oliver Neukum wrote:
>
> Hi,
>
> this patch implements suspend/resume support for USB audio devices.
> It works with the microphone in my camera.
>
> Signed-off-by: Oliver Neukum <[EMAIL PROTECTED]>
Thanks, I applied it to ALSA HG tree now.
Takashi
>
> Regards
> Oliver
>
> ----
>
> --- a/sound/usb/usbaudio.h 2007-08-31 12:27:57.000000000 +0200
> +++ b/sound/usb/usbaudio.h 2007-08-31 12:29:55.000000000 +0200
> @@ -126,6 +126,7 @@ struct snd_usb_audio {
> u32 usb_id;
> int shutdown;
> int num_interfaces;
> + int num_suspended_intf;
>
> struct list_head pcm_list; /* list of pcm streams */
> int pcm_devs;
> --- a/sound/usb/usbaudio.c 2007-08-31 12:21:21.000000000 +0200
> +++ b/sound/usb/usbaudio.c 2007-08-31 15:32:09.000000000 +0200
> @@ -2078,6 +2078,8 @@ int snd_usb_ctl_msg(struct usb_device *d
> static int usb_audio_probe(struct usb_interface *intf,
> const struct usb_device_id *id);
> static void usb_audio_disconnect(struct usb_interface *intf);
> +static int usb_audio_suspend(struct usb_interface *intf, pm_message_t
> message);
> +static int usb_audio_resume(struct usb_interface *intf);
>
> static struct usb_device_id usb_audio_ids [] = {
> #include "usbquirks.h"
> @@ -2093,6 +2095,8 @@ static struct usb_driver usb_audio_drive
> .name = "snd-usb-audio",
> .probe = usb_audio_probe,
> .disconnect = usb_audio_disconnect,
> + .suspend = usb_audio_suspend,
> + .resume = usb_audio_resume,
> .id_table = usb_audio_ids,
> };
>
> @@ -3664,6 +3668,43 @@ static void usb_audio_disconnect(struct
> dev_get_drvdata(&intf->dev));
> }
>
> +static int usb_audio_suspend(struct usb_interface *intf, pm_message_t
> message)
> +{
> + struct snd_usb_audio *chip = dev_get_drvdata(&intf->dev);
> + struct list_head *p;
> + struct snd_usb_stream *as;
> +
> + if (chip == (void *)-1L)
> + return 0;
> +
> + snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot);
> + if (!chip->num_suspended_intf++) {
> + list_for_each(p, &chip->pcm_list) {
> + as = list_entry(p, struct snd_usb_stream, list);
> + snd_pcm_suspend_all(as->pcm);
> + }
> + }
> +
> + return 0;
> +}
> +
> +static int usb_audio_resume(struct usb_interface *intf)
> +{
> + struct snd_usb_audio *chip = dev_get_drvdata(&intf->dev);
> +
> + if (chip == (void *)-1L)
> + return 0;
> + if (--chip->num_suspended_intf)
> + return 0;
> + /*
> + * ALSA leaves material resumption to user space
> + * we just notify
> + */
> +
> + snd_power_change_state(chip->card, SNDRV_CTL_POWER_D0);
> +
> + return 0;
> +}
>
> static int __init snd_usb_audio_init(void)
> {
>
-
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
