[GIT PULL] sound fixes for 3.7-rc7

[GIT PULL] sound fixes for 3.7-rc7

[Takashi Iwai]

Linus,

please pull sound updates for v3.7-rc7 from:

  git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.7

The topmost commit is 947d299686aa9cc8aecf749d54e8475c6e498956

----------------------------------------------------------------

Sound fixes for 3.7-rc7

The highlight of this update is the fixes for ASoC kirkwood by Russell.
In addition to that, a couple of regression fixes for HD-audio due to
the runtime PM support on 3.7, and other driver-specific regression
fixes like USB MIDI on non-standard USB audio drivers.

----------------------------------------------------------------

Clemens Ladisch (1):
      ALSA: ua101, usx2y: fix broken MIDI output

Daniel Mack (2):
      ASoC: cs4271: free allocated GPIO
      ALSA: snd-usb: properly initialize the sync endpoint

David Henningsson (2):
      ALSA: hda - Add support for Realtek ALC292
      ALSA: hda - Cirrus: Correctly clear line_out_pins when moving to speaker

Dimitris Papastamos (1):
      ASoC: arizona: Fix typo - Swap value in 48k_rates[] and 44k1_rates[]

Mark Brown (1):
      ASoC: bells: Fix up git patch application failure

Russell King (5):
      ASoC: kirkwood-dma: fix use of virt_to_phys()
      ASoC: kirkwood-dma: don't ignore other irq causes on error
      ASoC: kirkwood-i2s: fix DCO lock detection
      ASoC: kirkwood-i2s: fix DMA underruns
      ASoC: kirkwood-i2s: more pause-mode fixes

Takashi Iwai (2):
      ALSA: hda - Fix recursive suspend/resume call
      ALSA: hda - Limit runtime PM support only to known Intel chips

---
 sound/pci/hda/hda_codec.c         | 11 ++++--
 sound/pci/hda/hda_codec.h         |  1 +
 sound/pci/hda/hda_intel.c         | 39 +++++++++++----------
 sound/pci/hda/patch_cirrus.c      |  1 +
 sound/pci/hda/patch_realtek.c     |  1 +
 sound/soc/codecs/arizona.c        |  4 +--
 sound/soc/codecs/cs4271.c         | 11 ++----
 sound/soc/kirkwood/kirkwood-dma.c |  3 +-
 sound/soc/kirkwood/kirkwood-i2s.c | 74 +++++++++++++++++++--------------------
 sound/soc/samsung/bells.c         |  4 +--
 sound/usb/midi.c                  |  8 +++--
 sound/usb/pcm.c                   |  2 +-
 12 files changed, 84 insertions(+), 75 deletions(-)

Re: [GIT PULL] sound fixes for 3.7-rc7

[Markus Trippelsdorf]

On 2012.11.23 at 14:23 +0100, Takashi Iwai wrote:
> Sound fixes for 3.7-rc7
> 
> The highlight of this update is the fixes for ASoC kirkwood by Russell.
> In addition to that, a couple of regression fixes for HD-audio due to
> the runtime PM support on 3.7, and other driver-specific regression
> fixes like USB MIDI on non-standard USB audio drivers.
> 
> Takashi Iwai (2):
>       ALSA: hda - Fix recursive suspend/resume call

This commit causes with !CONFIG_PM:

ound/pci/hda/hda_codec.c: In function ‘codec_exec_verb’:
sound/pci/hda/hda_codec.c:231:12: error: ‘struct hda_codec’ has no member named ‘in_pm’
  if (!codec->in_pm && res && *res == -1 && bus->rirb_error) {
            ^
sound/pci/hda/hda_codec.c:241:19: error: ‘struct hda_codec’ has no member named ‘in_pm’
  if (!err || codec->in_pm)
                   ^
make[3]: *** [sound/pci/hda/hda_codec.o] Error 1


-- 
Markus

Re: [GIT PULL] sound fixes for 3.7-rc7

[Takashi Iwai]

At Sat, 24 Nov 2012 10:46:10 +0100,
Markus Trippelsdorf wrote:
> 
> On 2012.11.23 at 14:23 +0100, Takashi Iwai wrote:
> > Sound fixes for 3.7-rc7
> > 
> > The highlight of this update is the fixes for ASoC kirkwood by Russell.
> > In addition to that, a couple of regression fixes for HD-audio due to
> > the runtime PM support on 3.7, and other driver-specific regression
> > fixes like USB MIDI on non-standard USB audio drivers.
> > 
> > Takashi Iwai (2):
> >       ALSA: hda - Fix recursive suspend/resume call
> 
> This commit causes with !CONFIG_PM:
> 
> ound/pci/hda/hda_codec.c: In function ‘codec_exec_verb’:
> sound/pci/hda/hda_codec.c:231:12: error: ‘struct hda_codec’ has no member named ‘in_pm’
>   if (!codec->in_pm && res && *res == -1 && bus->rirb_error) {
>             ^
> sound/pci/hda/hda_codec.c:241:19: error: ‘struct hda_codec’ has no member named ‘in_pm’
>   if (!err || codec->in_pm)
>                    ^
> make[3]: *** [sound/pci/hda/hda_codec.o] Error 1

Oops sorry.  I fixed now with the patch below.
I'm going to send another pull request for this fix.


thanks,

Takashi

---
From: Takashi Iwai <tiwai@suse.de>
Subject: [PATCH] ALSA: hda - Fix build without CONFIG_PM

I forgot this again...  codec->in_pm is in #ifdef CONFIG_PM

Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/pci/hda/hda_codec.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index cebe2dfd..d010de1 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -95,6 +95,7 @@ int snd_hda_delete_codec_preset(struct hda_codec_preset_list *preset)
 EXPORT_SYMBOL_HDA(snd_hda_delete_codec_preset);
 
 #ifdef CONFIG_PM
+#define codec_in_pm(codec)	((codec)->in_pm)
 static void hda_power_work(struct work_struct *work);
 static void hda_keep_power_on(struct hda_codec *codec);
 #define hda_codec_is_power_on(codec)	((codec)->power_on)
@@ -104,6 +105,7 @@ static inline void hda_call_pm_notify(struct hda_bus *bus, bool power_up)
 		bus->ops.pm_notify(bus, power_up);
 }
 #else
+#define codec_in_pm(codec)	0
 static inline void hda_keep_power_on(struct hda_codec *codec) {}
 #define hda_codec_is_power_on(codec)	1
 #define hda_call_pm_notify(bus, state) {}
@@ -228,7 +230,7 @@ static int codec_exec_verb(struct hda_codec *codec, unsigned int cmd,
 	}
 	mutex_unlock(&bus->cmd_mutex);
 	snd_hda_power_down(codec);
-	if (!codec->in_pm && res && *res == -1 && bus->rirb_error) {
+	if (!codec_in_pm(codec) && res && *res == -1 && bus->rirb_error) {
 		if (bus->response_reset) {
 			snd_printd("hda_codec: resetting BUS due to "
 				   "fatal communication error\n");
@@ -238,7 +240,7 @@ static int codec_exec_verb(struct hda_codec *codec, unsigned int cmd,
 		goto again;
 	}
 	/* clear reset-flag when the communication gets recovered */
-	if (!err || codec->in_pm)
+	if (!err || codec_in_pm(codec))
 		bus->response_reset = 0;
 	return err;
 }
-- 
1.8.0