From a188d2d337da07959bc8a4bbf5e4914bad157322 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 17 Jun 2011 14:54:47 +0200
Subject: [PATCH] --- yaml --- r: 257618 b: refs/heads/master c:
 3409fcd1f71d02025e3f179127a8ba243c525d78 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/sound/firewire/isight.c   |  1 +
 trunk/sound/pci/hda/hda_beep.h  |  2 +-
 trunk/sound/pci/hda/patch_via.c | 11 +++++++----
 trunk/sound/pci/lola/lola.c     |  2 +-
 trunk/sound/usb/6fire/pcm.c     |  4 ++--
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 964a91a212b8..cef2337dcf66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4b1e98aa93d548e5d51c8c5272ea08562fc71c1
+refs/heads/master: 3409fcd1f71d02025e3f179127a8ba243c525d78
diff --git a/trunk/sound/firewire/isight.c b/trunk/sound/firewire/isight.c
index 86ee16ca365e..440030818db7 100644
--- a/trunk/sound/firewire/isight.c
+++ b/trunk/sound/firewire/isight.c
@@ -209,6 +209,7 @@ static void isight_packet(struct fw_iso_context *context, u32 cycle,
 		isight->packet_index = -1;
 		return;
 	}
+	fw_iso_context_queue_flush(isight->context);
 
 	if (++index >= QUEUE_LENGTH)
 		index = 0;
diff --git a/trunk/sound/pci/hda/hda_beep.h b/trunk/sound/pci/hda/hda_beep.h
index 4967eabe774e..55f0647458c7 100644
--- a/trunk/sound/pci/hda/hda_beep.h
+++ b/trunk/sound/pci/hda/hda_beep.h
@@ -54,7 +54,7 @@ static inline int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
 {
 	return 0;
 }
-void snd_hda_detach_beep_device(struct hda_codec *codec)
+static inline void snd_hda_detach_beep_device(struct hda_codec *codec)
 {
 }
 #endif
diff --git a/trunk/sound/pci/hda/patch_via.c b/trunk/sound/pci/hda/patch_via.c
index 605c99e1e520..c952582fb218 100644
--- a/trunk/sound/pci/hda/patch_via.c
+++ b/trunk/sound/pci/hda/patch_via.c
@@ -832,10 +832,13 @@ static int via_hp_build(struct hda_codec *codec)
 	knew->subdevice = HDA_SUBDEV_NID_FLAG | nid;
 	knew->private_value = nid;
 
-	knew = via_clone_control(spec, &via_hp_mixer[1]);
-	if (knew == NULL)
-		return -ENOMEM;
-	knew->subdevice = side_mute_channel(spec);
+	nid = side_mute_channel(spec);
+	if (nid) {
+		knew = via_clone_control(spec, &via_hp_mixer[1]);
+		if (knew == NULL)
+			return -ENOMEM;
+		knew->subdevice = nid;
+	}
 
 	return 0;
 }
diff --git a/trunk/sound/pci/lola/lola.c b/trunk/sound/pci/lola/lola.c
index 1dc6f5b1d668..3e92e5b5ec3d 100644
--- a/trunk/sound/pci/lola/lola.c
+++ b/trunk/sound/pci/lola/lola.c
@@ -445,7 +445,7 @@ static void lola_reset_setups(struct lola *chip)
 	lola_setup_all_analog_gains(chip, PLAY, false); /* output, update */
 }
 
-static int lola_parse_tree(struct lola *chip)
+static int __devinit lola_parse_tree(struct lola *chip)
 {
 	unsigned int val;
 	int nid, err;
diff --git a/trunk/sound/usb/6fire/pcm.c b/trunk/sound/usb/6fire/pcm.c
index b137b25865cc..d144cdb2f159 100644
--- a/trunk/sound/usb/6fire/pcm.c
+++ b/trunk/sound/usb/6fire/pcm.c
@@ -395,12 +395,12 @@ static int usb6fire_pcm_open(struct snd_pcm_substream *alsa_sub)
 	alsa_rt->hw = pcm_hw;
 
 	if (alsa_sub->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-		if (rt->rate >= 0)
+		if (rt->rate < ARRAY_SIZE(rates))
 			alsa_rt->hw.rates = rates_alsaid[rt->rate];
 		alsa_rt->hw.channels_max = OUT_N_CHANNELS;
 		sub = &rt->playback;
 	} else if (alsa_sub->stream == SNDRV_PCM_STREAM_CAPTURE) {
-		if (rt->rate >= 0)
+		if (rt->rate < ARRAY_SIZE(rates))
 			alsa_rt->hw.rates = rates_alsaid[rt->rate];
 		alsa_rt->hw.channels_max = IN_N_CHANNELS;
 		sub = &rt->capture;