Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[firefly-linux-kernel-4.4.55.git] / drivers / char / snsc.c

diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c
index b543821d8cb4c6be928c2769bce38b5f649fb9a8..56c8243cdb734b2d9212ec1eed9643560e82864b 100644 (file)
--- 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),