diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-07-14 16:49:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-07-14 17:00:28 -0700 |
| commit | a49261585e2c89f16b5a4bb80f623d2e9c2c1566 (patch) | |
| tree | 31a7affd8a1f0f26704400a2e1db7499e617ec48 | |
| parent | 5b4bbb3d78285ab735941365c17f1c55a228c659 (diff) | |
| download | op-kernel-dev-a49261585e2c89f16b5a4bb80f623d2e9c2c1566.zip op-kernel-dev-a49261585e2c89f16b5a4bb80f623d2e9c2c1566.tar.gz | |
[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 <davem@davemloft.net>
| -rw-r--r-- | arch/sparc64/kernel/pci_psycho.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c index 197a7ff..83f88ad 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); |
