Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52debb06 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

pcmcia: include bad CIS filename in error message 



- Print the invalid CIS filename in the invalid filename message.
- Use sizeof() instead of hard-coded constant for buffer size.

Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d6b4fa6d

drivers/pcmcia/ds.c

+3 −2
Original line number Diff line number Diff line
@@ -865,11 +865,12 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename) 
	ds_dbg(1, "trying to load CIS file %s\n", filename);



	if (strlen(filename) > 14) {

		printk(KERN_WARNING "pcmcia: CIS filename is too long\n");

		printk(KERN_WARNING "pcmcia: CIS filename is too long [%s]\n",

			filename);

		return -EINVAL;

	}



	snprintf(path, 20, "%s", filename);

	snprintf(path, sizeof(path), "%s", filename);



	if (request_firmware(&fw, path, &dev->dev) == 0) {

		if (fw->size >= CISTPL_MAX_CIS_SIZE) {