diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-09-04 10:10:27 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-09-04 10:10:27 +0200 |
commit | 2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91 (patch) | |
tree | 1cd995a5f989c879d3d71566a1fa2db9745c5263 /sound/usb/quirks.c | |
parent | 1f7f51a63114bab3a05920f4b1343154e95e2cb6 (diff) | |
parent | 39cdc62b1b4efa39831d4de22f990043b0304fff (diff) |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/usb/quirks.c')
-rw-r--r-- | sound/usb/quirks.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 5d2a63248b1d..913552078285 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -146,10 +146,9 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip, unsigned *rate_table = NULL; fp = kmemdup(quirk->data, sizeof(*fp), GFP_KERNEL); - if (!fp) { - usb_audio_err(chip, "cannot memdup\n"); + if (!fp) return -ENOMEM; - } + INIT_LIST_HEAD(&fp->list); if (fp->nr_rates > MAX_NR_RATES) { kfree(fp); |