aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-06-24 09:45:55 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2008-06-24 09:45:55 -0400
commitfeda4f2c190f4efc101857935db0917ff3e4e23d (patch)
tree9e532a8bd1936d81e767cfc551c95526445a06ea /drivers
parent8b5332f6994e34f2b400b25975760da709bbaa63 (diff)
pcmcia: allow for longer CIS firmware files
Don't be more zealous with memory than the firmware class core. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pcmcia/ds.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 461b8a9a9f38..4174d9656e35 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -850,7 +850,7 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)
850{ 850{
851 struct pcmcia_socket *s = dev->socket; 851 struct pcmcia_socket *s = dev->socket;
852 const struct firmware *fw; 852 const struct firmware *fw;
853 char path[20]; 853 char path[FIRMWARE_NAME_MAX];
854 int ret = -ENOMEM; 854 int ret = -ENOMEM;
855 int no_funcs; 855 int no_funcs;
856 int old_funcs; 856 int old_funcs;
@@ -862,7 +862,7 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)
862 862
863 ds_dbg(1, "trying to load CIS file %s\n", filename); 863 ds_dbg(1, "trying to load CIS file %s\n", filename);
864 864
865 if (strlen(filename) > 14) { 865 if (strlen(filename) > (FIRMWARE_NAME_MAX - 1)) {
866 printk(KERN_WARNING "pcmcia: CIS filename is too long [%s]\n", 866 printk(KERN_WARNING "pcmcia: CIS filename is too long [%s]\n",
867 filename); 867 filename);
868 return -EINVAL; 868 return -EINVAL;