From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 7 Nov 2019 15:27:49 +0000 (+0100)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: for-linus-20191205~91^2~61
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=66a8966aac12f2a79de514dbbe99c9b3e90c9280;p=linux-2.6-block.git

Merge branch 'for-linus' into for-next

Merge 5.4-devel branch for applying the further ALSA timer fixes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

66a8966aac12f2a79de514dbbe99c9b3e90c9280
diff --cc sound/core/timer.c
index 219249627cc3,59ae21b0bb93..013f0e69ff0f
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@@ -266,10 -261,9 +268,10 @@@ int snd_timer_open(struct snd_timer_ins
  		timeri->slave_id = tid->device;
  		timeri->flags |= SNDRV_TIMER_IFLG_SLAVE;
  		list_add_tail(&timeri->open_list, &snd_timer_slave_list);
 +		num_slaves++;
  		err = snd_timer_check_slave(timeri);
  		if (err < 0) {
- 			snd_timer_close_locked(timeri);
+ 			snd_timer_close_locked(timeri, &card_dev_to_put);
  			timeri = NULL;
  		}
  		goto unlock;