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

Commit 17a4adbe authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next

parents c9adeefd 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
@@ -2124,6 +2124,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;

}

}
@@ -2137,6 +2138,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;