From: David S. Miller Date: Fri, 14 Jul 2006 23:49:55 +0000 (-0700) Subject: [SPARC64] psycho: Fix pbm->name handling in pbm_register_toplevel_resources() X-Git-Tag: v2.6.18-rc2~7^2~1 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a49261585e2c89f16b5a4bb80f623d2e9c2c1566;p=linux-2.6 [SPARC64] psycho: Fix pbm->name handling in pbm_register_toplevel_resources() We shouldn't overwrite it, it's the device node full name already and that's what we want. Based upon a report from Marc Zyngier. Signed-off-by: David S. Miller --- diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c index 197a7ffd57..83f88ad4ff 100644 --- a/arch/sparc64/kernel/pci_psycho.c +++ b/arch/sparc64/kernel/pci_psycho.c @@ -1099,9 +1099,6 @@ static void pbm_register_toplevel_resources(struct pci_controller_info *p, { char *name = pbm->name; - sprintf(name, "PSYCHO%d PBM%c", - p->index, - (pbm == &p->pbm_A ? 'A' : 'B')); pbm->io_space.name = pbm->mem_space.name = name; request_resource(&ioport_resource, &pbm->io_space);