aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakpm@osdl.org <akpm@osdl.org>2006-04-22 02:36:15 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-22 09:19:53 -0700
commit8c4335a87c9785d2102ab23f09393038e1663314 (patch)
treeba1a2301512c4c22336f5cdaf18154a295b898d6
parent5b20192727ef2c047343a043ee4fbda67e2beef4 (diff)
[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: Greg Howard <ghoward@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/char/snsc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c
index b543821d8cb..56c8243cdb7 100644
--- a/drivers/char/snsc.c
+++ b/drivers/char/snsc.c
@@ -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),