From 5101d53073d79a9a1f9c0e3c8b36305bffe38f02 Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Thu, 10 Nov 2011 19:38:43 +0100
Subject: [PATCH] --- yaml --- r: 275309 b: refs/heads/master c:
 43df2a57b773596cd0bdd2316889ff9653121015 h: refs/heads/master i:   275307:
 add1651e889ad84ef09ba48afbf72aaade982aae v: v3

---
 [refs]                   | 2 +-
 trunk/sound/usb/quirks.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 5fbda6a298cd..9b8018485bce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f451d2a2a44b66586b803763068195088f9ccd4
+refs/heads/master: 43df2a57b773596cd0bdd2316889ff9653121015
diff --git a/trunk/sound/usb/quirks.c b/trunk/sound/usb/quirks.c
index 2e5bc7344026..a3ddac0deffd 100644
--- a/trunk/sound/usb/quirks.c
+++ b/trunk/sound/usb/quirks.c
@@ -137,12 +137,12 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip,
 		return -ENOMEM;
 	}
 	if (fp->nr_rates > 0) {
-		rate_table = kmalloc(sizeof(int) * fp->nr_rates, GFP_KERNEL);
+		rate_table = kmemdup(fp->rate_table,
+				     sizeof(int) * fp->nr_rates, GFP_KERNEL);
 		if (!rate_table) {
 			kfree(fp);
 			return -ENOMEM;
 		}
-		memcpy(rate_table, fp->rate_table, sizeof(int) * fp->nr_rates);
 		fp->rate_table = rate_table;
 	}
 
@@ -224,10 +224,9 @@ static int create_uaxx_quirk(struct snd_usb_audio *chip,
 	if (altsd->bNumEndpoints != 1)
 		return -ENXIO;
 
-	fp = kmalloc(sizeof(*fp), GFP_KERNEL);
+	fp = kmemdup(&ua_format, sizeof(*fp), GFP_KERNEL);
 	if (!fp)
 		return -ENOMEM;
-	memcpy(fp, &ua_format, sizeof(*fp));
 
 	fp->iface = altsd->bInterfaceNumber;
 	fp->endpoint = get_endpoint(alts, 0)->bEndpointAddress;