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

Commit 8c4335a8 authored by akpm@osdl.org's avatar akpm@osdl.org Committed by Linus Torvalds
Browse files

[PATCH] Altix snsc: duplicate kobject fix 



from: Greg Howard <ghoward@sgi.com>

Fix Altix system controller (snsc) device names to include the slot number
of the blade whose associated system controller is the target of the device
interface.  Including the slot number avoids a problem we're currently
having where slots within the same enclosure are attempting to create
multiple kobjects with identical names.

Signed-off-by: default avatarGreg Howard <ghoward@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5b201927

drivers/char/snsc.c

+2 −1
Original line number Diff line number Diff line
@@ -390,7 +390,8 @@ scdrv_init(void) 
			format_module_id(devnamep, geo_module(geoid),

					 MODULE_FORMAT_BRIEF);

			devnamep = devname + strlen(devname);

			sprintf(devnamep, "#%d", geo_slab(geoid));

			sprintf(devnamep, "^%d#%d", geo_slot(geoid),

				geo_slab(geoid));



			/* allocate sysctl device data */

			scd = kzalloc(sizeof (struct sysctl_data_s),