From c127b565c1b8b2d0c3d9ed0e1e17facb0a5f4d8f Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 30 Apr 2009 15:23:42 +0200 Subject: [PATCH] --- yaml --- r: 151266 b: refs/heads/master c: 2bdf914915e98fe82495d05741a57e37f4b604e8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/bsg.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index abc738c2ece5..fb8cd07e35a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ce8a0d396288f28070483a8190843c23b8282f4 +refs/heads/master: 2bdf914915e98fe82495d05741a57e37f4b604e8 diff --git a/trunk/block/bsg.c b/trunk/block/bsg.c index 5358f9ae13c1..54106f052f70 100644 --- a/trunk/block/bsg.c +++ b/trunk/block/bsg.c @@ -1065,6 +1065,11 @@ EXPORT_SYMBOL_GPL(bsg_register_queue); static struct cdev bsg_cdev; +static char *bsg_nodename(struct device *dev) +{ + return kasprintf(GFP_KERNEL, "bsg/%s", dev_name(dev)); +} + static int __init bsg_init(void) { int ret, i; @@ -1085,6 +1090,7 @@ static int __init bsg_init(void) ret = PTR_ERR(bsg_class); goto destroy_kmemcache; } + bsg_class->nodename = bsg_nodename; ret = alloc_chrdev_region(&devid, 0, BSG_MAX_DEVS, "bsg"); if (ret)