Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4926158 authored by David S. Miller's avatar David S. Miller
Browse files

[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: default avatarDavid S. Miller <davem@davemloft.net>
parent 5b4bbb3d

arch/sparc64/kernel/pci_psycho.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -1099,9 +1099,6 @@ static void pbm_register_toplevel_resources(struct pci_controller_info *p, 
{

{

	char *name = pbm->name;

	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;

	pbm->io_space.name = pbm->mem_space.name = name;





	request_resource(&ioport_resource, &pbm->io_space);

	request_resource(&ioport_resource, &pbm->io_space);