diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-06-24 15:45:55 +0200 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-06-24 15:45:55 +0200 |
| commit | feda4f2c190f4efc101857935db0917ff3e4e23d (patch) | |
| tree | 9e532a8bd1936d81e767cfc551c95526445a06ea /drivers/pcmcia | |
| parent | pcmcia: cm40x0 cdev lock_kernel() pushdown (diff) | |
| download | linux-feda4f2c190f4efc101857935db0917ff3e4e23d.tar.xz linux-feda4f2c190f4efc101857935db0917ff3e4e23d.zip | |
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/pcmcia')
| -rw-r--r-- | drivers/pcmcia/ds.c | 4 |
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) { struct pcmcia_socket *s = dev->socket; const struct firmware *fw; - char path[20]; + char path[FIRMWARE_NAME_MAX]; int ret = -ENOMEM; int no_funcs; int old_funcs; @@ -862,7 +862,7 @@ 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) { + if (strlen(filename) > (FIRMWARE_NAME_MAX - 1)) { printk(KERN_WARNING "pcmcia: CIS filename is too long [%s]\n", filename); return -EINVAL; |