Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f561834 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Most of commits are for stable and regression fixes.  Except for one
  fix for a regression in 3.7-rc4, there are all driver local changes,
  so nothing too much to worry."

* tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: Fix card refcount unbalance
  ALSA: hda - Add new codec ALC668 and ALC900 (default name ALC1150)
  ALSA: hda - Improve HP depop when system enter to S3
  ALSA: usb-audio: Fix crash at re-preparing the PCM stream
  ALSA: hdspm - Fix sync check reporting on RME RayDAT
  ALSA: hda - Add pin fixups for ASUS G75
  ALSA: hda - Fix invalid connections in VT1802 codec
  ALSA: hda - Fix empty DAC filling in patch_via.c
  ALSA: hda - Force to reset IEC958 status bits for AD codecs
  ALSA: es1968: Add ESS vendor ID to pm_whitelist
  ALSA: HDA: Mark CS260x immutable structures const
  ALSA: HDA: Fix digital microphone on CS420x
  ALSA: hda: Cirrus: Fix coefficient index for beep configuration
  ALSA: hda - support Teradici 2200 host card audio
  ALSA: Fix typo in drivers sound
parents a186d25d 8bb4d9ce

sound/core/oss/mixer_oss.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -76,6 +76,7 @@ static int snd_mixer_oss_open(struct inode *inode, struct file *file) 
		snd_card_unref(card);

		snd_card_unref(card);

		return -EFAULT;

		return -EFAULT;

	}

	}

	snd_card_unref(card);

	return 0;

	return 0;

}

}

sound/core/oss/pcm_oss.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -2454,6 +2454,7 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file) 
	mutex_unlock(&pcm->open_mutex);

	mutex_unlock(&pcm->open_mutex);

	if (err < 0)

	if (err < 0)

		goto __error;

		goto __error;

	snd_card_unref(pcm->card);

	return err;

	return err;





      __error:

      __error:

sound/core/pcm_native.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -2122,6 +2122,7 @@ static int snd_pcm_playback_open(struct inode *inode, struct file *file) 
	pcm = snd_lookup_minor_data(iminor(inode),

	pcm = snd_lookup_minor_data(iminor(inode),

				    SNDRV_DEVICE_TYPE_PCM_PLAYBACK);

				    SNDRV_DEVICE_TYPE_PCM_PLAYBACK);

	err = snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_PLAYBACK);

	err = snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_PLAYBACK);

	if (pcm)

		snd_card_unref(pcm->card);

		snd_card_unref(pcm->card);

	return err;

	return err;

}

}
@@ -2135,6 +2136,7 @@ static int snd_pcm_capture_open(struct inode *inode, struct file *file) 
	pcm = snd_lookup_minor_data(iminor(inode),

	pcm = snd_lookup_minor_data(iminor(inode),

				    SNDRV_DEVICE_TYPE_PCM_CAPTURE);

				    SNDRV_DEVICE_TYPE_PCM_CAPTURE);

	err = snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_CAPTURE);

	err = snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_CAPTURE);

	if (pcm)

		snd_card_unref(pcm->card);

		snd_card_unref(pcm->card);

	return err;

	return err;

}

}

sound/core/sound.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -114,7 +114,7 @@ void *snd_lookup_minor_data(unsigned int minor, int type) 
	mreg = snd_minors[minor];

	mreg = snd_minors[minor];

	if (mreg && mreg->type == type) {

	if (mreg && mreg->type == type) {

		private_data = mreg->private_data;

		private_data = mreg->private_data;

		if (mreg->card_ptr)

		if (private_data && mreg->card_ptr)

			atomic_inc(&mreg->card_ptr->refcount);

			atomic_inc(&mreg->card_ptr->refcount);

	} else

	} else

		private_data = NULL;

		private_data = NULL;

sound/core/sound_oss.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ void *snd_lookup_oss_minor_data(unsigned int minor, int type) 
	mreg = snd_oss_minors[minor];

	mreg = snd_oss_minors[minor];

	if (mreg && mreg->type == type) {

	if (mreg && mreg->type == type) {

		private_data = mreg->private_data;

		private_data = mreg->private_data;

		if (mreg->card_ptr)

		if (private_data && mreg->card_ptr)

			atomic_inc(&mreg->card_ptr->refcount);

			atomic_inc(&mreg->card_ptr->refcount);

	} else

	} else

		private_data = NULL;

		private_data = NULL;