aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pcmcia/ds.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 846468ce1144..5a85871f5ee9 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -865,11 +865,12 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)
865 ds_dbg(1, "trying to load CIS file %s\n", filename); 865 ds_dbg(1, "trying to load CIS file %s\n", filename);
866 866
867 if (strlen(filename) > 14) { 867 if (strlen(filename) > 14) {
868 printk(KERN_WARNING "pcmcia: CIS filename is too long\n"); 868 printk(KERN_WARNING "pcmcia: CIS filename is too long [%s]\n",
869 filename);
869 return -EINVAL; 870 return -EINVAL;
870 } 871 }
871 872
872 snprintf(path, 20, "%s", filename); 873 snprintf(path, sizeof(path), "%s", filename);
873 874
874 if (request_firmware(&fw, path, &dev->dev) == 0) { 875 if (request_firmware(&fw, path, &dev->dev) == 0) {
875 if (fw->size >= CISTPL_MAX_CIS_SIZE) { 876 if (fw->size >= CISTPL_MAX_CIS_SIZE) {