iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: jr3_pci: use kasprintf

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten 2013-05-17 11:16:12 -07:00 committed by Greg Kroah-Hartman
parent cb560c401b
commit a31e0f89cd
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/comedi/drivers/jr3_pci.c
View File

@ -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)