1 files changed, 4 insertions, 0 deletions

diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index fb62bce2435c..6178bb5d0731 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -150,6 +150,7 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip,
                 usb_audio_err(chip, "cannot memdup\n");
                 return -ENOMEM;
         }
+        INIT_LIST_HEAD(&fp->list);
         if (fp->nr_rates > MAX_NR_RATES) {
                 kfree(fp);
                 return -EINVAL;
@@ -193,6 +194,7 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip,
         return 0;
 
  error:
+        list_del(&fp->list); /* unlink for avoiding double-free */
         kfree(fp);
         kfree(rate_table);
         return err;
@@ -469,6 +471,7 @@ static int create_uaxx_quirk(struct snd_usb_audio *chip,
         fp->ep_attr = get_endpoint(alts, 0)->bmAttributes;
         fp->datainterval = 0;
         fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize);
+        INIT_LIST_HEAD(&fp->list);
 
         switch (fp->maxpacksize) {
         case 0x120:
@@ -492,6 +495,7 @@ static int create_uaxx_quirk(struct snd_usb_audio *chip,
                 ? SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK;
         err = snd_usb_add_audio_stream(chip, stream, fp);
         if (err < 0) {
+                list_del(&fp->list); /* unlink for avoiding double-free */
                 kfree(fp);
                 return err;
         }