diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-05-17 18:16:12 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-17 19:09:48 (GMT) |
| commit | a31e0f89cd33a9459f1ae9eb13141fb286c957ab (patch) | |
| tree | d0c66d7980a2f747419c367a6f0e071a382d3d7b /drivers/staging | |
| parent | cb560c401bf2f212167fdf3bfb15e57a78e2fa03 (diff) | |
| download | linux-fsl-qoriq-a31e0f89cd33a9459f1ae9eb13141fb286c957ab.tar.xz | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/comedi/drivers/jr3_pci.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c index c240e6d..42e78d1 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) |