The patch titled radeonfb: use PCI device Id in hex for name string has been added to the -mm tree. Its filename is radeonfb-use-pci-device-id-in-hex-for-name-string.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: radeonfb: use PCI device Id in hex for name string From: Andreas Herrmann <aherrman@xxxxxxxx> .. instead of potentially using nonprintable characters. I guess the former (odd) concatenation was used to construct name strings that match the "*_ATI_RADEON_??" macros in include/linux/pci_ids.h The PCI Id in hex is much more convenient to use. E.g. it can easily be verified against "lspci -nn" output. Signed-off-by: Andreas Herrmann <aherrman@xxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: "Antonino A. Daplas" <adaplas@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/aty/radeon_base.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff -puN drivers/video/aty/radeon_base.c~radeonfb-use-pci-device-id-in-hex-for-name-string drivers/video/aty/radeon_base.c --- a/drivers/video/aty/radeon_base.c~radeonfb-use-pci-device-id-in-hex-for-name-string +++ a/drivers/video/aty/radeon_base.c @@ -2184,9 +2184,8 @@ static int __devinit radeonfb_pci_regist rinfo->lvds_timer.function = radeon_lvds_timer_func; rinfo->lvds_timer.data = (unsigned long)rinfo; - strcpy(rinfo->name, "ATI Radeon XX "); - rinfo->name[11] = ent->device >> 8; - rinfo->name[12] = ent->device & 0xFF; + snprintf(rinfo->name, sizeof(rinfo->name), + "ATI Radeon %x", ent->device & 0xffff); rinfo->family = ent->driver_data & CHIP_FAMILY_MASK; rinfo->chipset = pdev->device; rinfo->has_CRTC2 = (ent->driver_data & CHIP_HAS_CRTC2) != 0; _ Patches currently in -mm which might be from aherrman@xxxxxxxx are radeonfb-add-pci-id-for-rs482-radeon-xpress-200m.patch radeonfb-add-new-module-parameter-to-force-pll-calculation.patch radeonfb-add-new-module-parameter-to-force-pll-calculation-fix.patch radeonfb-fix-setting-of-ppll_ref_div-for-rv370-5b60.patch radeonfb-use-pci-device-id-in-hex-for-name-string.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