From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Fri, 17 May 2013 18:16:12 +0000 (-0700)
Subject: staging: comedi: jr3_pci: use kasprintf
X-Git-Tag: firefly_0821_release~176^2~5845^2~588
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a31e0f89cd33a9459f1ae9eb13141fb286c957ab;p=firefly-linux-kernel-4.4.55.git

staging: comedi: jr3_pci: use kasprintf

kasprintf combines kmalloc and sprintf, and takes care of the size
calculation itself.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index c240e6d432cd..42e78d1e2ae9 100644
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -101,15 +101,11 @@ static int comedi_load_firmware(struct comedi_device *dev, const char *name,
 	int result = 0;
 	const struct firmware *fw;
 	char *firmware_path;
-	static const char *prefix = "comedi/";
 
-	firmware_path = kmalloc(strlen(prefix) + strlen(name) + 1, GFP_KERNEL);
+	firmware_path = kasprintf(GFP_KERNEL, "comedi/%s", name);
 	if (!firmware_path) {
 		result = -ENOMEM;
 	} else {
-		firmware_path[0] = '\0';
-		strcat(firmware_path, prefix);
-		strcat(firmware_path, name);
 		result = request_firmware(&fw, firmware_path, &pcidev->dev);
 		if (result == 0) {
 			if (!cb)