From 7a4ff698036db013e1ecb42b0666b5f01b8c4271 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 15 Mar 2012 16:14:38 +0100 Subject: [PATCH] --- yaml --- r: 293147 b: refs/heads/master c: 0717d0f5d2737a63650a8d928360769e0d411bd5 h: refs/heads/master i: 293145: e076acd68dc51dabb291fe21d9a4964dcba10654 293143: 2b0dd92394ba165dcda2d4350774f3563b6d3e9d v: v3 --- [refs] | 2 +- trunk/sound/usb/pcm.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ab36e6d9d7d7..10808ec914d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1662591b2e6876b8bc041cd48837ccd297c2028f +refs/heads/master: 0717d0f5d2737a63650a8d928360769e0d411bd5 diff --git a/trunk/sound/usb/pcm.c b/trunk/sound/usb/pcm.c index 0220b0f335b9..0eed6115c2d4 100644 --- a/trunk/sound/usb/pcm.c +++ b/trunk/sound/usb/pcm.c @@ -695,6 +695,7 @@ static int snd_usb_pcm_check_knot(struct snd_pcm_runtime *runtime, struct snd_usb_substream *subs) { struct audioformat *fp; + int *rate_list; int count = 0, needs_knot = 0; int err; @@ -708,7 +709,8 @@ static int snd_usb_pcm_check_knot(struct snd_pcm_runtime *runtime, if (!needs_knot) return 0; - subs->rate_list.list = kmalloc(sizeof(int) * count, GFP_KERNEL); + subs->rate_list.list = rate_list = + kmalloc(sizeof(int) * count, GFP_KERNEL); if (!subs->rate_list.list) return -ENOMEM; subs->rate_list.count = count; @@ -717,7 +719,7 @@ static int snd_usb_pcm_check_knot(struct snd_pcm_runtime *runtime, list_for_each_entry(fp, &subs->fmt_list, list) { int i; for (i = 0; i < fp->nr_rates; i++) - subs->rate_list.list[count++] = fp->rate_table[i]; + rate_list[count++] = fp->rate_table[i]; } err = snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &subs->rate_list);