The patch titled pcmcia: include bad CIS filename in error message has been removed from the -mm tree. Its filename was pcmcia-include-bad-cis-filename-in-error-message.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: pcmcia: include bad CIS filename in error message From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> - 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 <randy.dunlap@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/pcmcia/ds.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff -puN drivers/pcmcia/ds.c~pcmcia-include-bad-cis-filename-in-error-message drivers/pcmcia/ds.c --- a/drivers/pcmcia/ds.c~pcmcia-include-bad-cis-filename-in-error-message +++ a/drivers/pcmcia/ds.c @@ -865,11 +865,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) { _ Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are origin.patch e1000e-make-e1000e-default-to-the-same-kconfig-setting-as-e1000.patch git-scsi-misc.patch git-unionfs.patch git-ipwireless_cs.patch register_cpu-__devinit-or-__cpuinit.patch cciss-use-upper_32_bits-macro-to-eliminate-warnings.patch tpm-infineon-section-mismatch.patch tdfxfb-fix-section-mismatch-warnings.patch uvesafb-small-cleanups.patch documentation-move-dnotifytxt-to-filesystems.patch documentation-move-sharedsubtreestxt-to-filesystems.patch documentation-create-new-scheduler-subdirectory.patch reporting-bugs-cc-the-mailing-list-too.patch kernel-doc-prevent-duplicate-description-output.patch kernel-doc-warn-on-badly-formatted-short-description.patch email-clientstxt-sylpheed-is-ok-at-imap.patch fs-menu-small-reorg.patch the-scheduled-time-option-removal.patch getdelays-fix-gcc-warnings.patch profile-likely-unlikely-macros.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html