From: Randy Dunlap <[EMAIL PROTECTED]>
- Print the invalid CIS filename in the invalid filename message.
- Use sizeof() instead of hard-coded constant for buffer size.
Signed-off-by: Randy Dunlap <[EMAIL PROTECTED]>
---
drivers/pcmcia/ds.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- linux-2.6.24-rc3-git2.orig/drivers/pcmcia/ds.c
+++ linux-2.6.24-rc3-git2/drivers/pcmcia/ds.c
@@ -864,11 +864,12 @@ static int pcmcia_load_firmware(struct p
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) {
---
~Randy
_______________________________________________
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
