---
block/bsg.c | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/block/bsg.c b/block/bsg.c
index ff64ae3..4eaa9e9 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -999,12 +999,6 @@ int bsg_register_queue(struct request_queue *q, struct device *parent,
dev_t dev;
int ret, minor;
struct device *class_dev = NULL;
- const char *devname;
-
- if (name)
- devname = name;
- else
- devname = dev_name(parent);
/*
* we need a proper transport to send commands, not a stacked device
@@ -1039,7 +1033,7 @@ int bsg_register_queue(struct request_queue *q, struct device *parent,
bcd->release = release;
kref_init(&bcd->ref);
dev = MKDEV(bsg_major, bcd->minor);
- class_dev = device_create(bsg_class, parent, dev, NULL, "%s", devname);
+ class_dev = device_create(bsg_class, parent, dev, NULL, "%s", name ? name : dev_name(parent));
if (IS_ERR(class_dev)) {
ret = PTR_ERR(class_dev);
goto put_dev;
--
1.7.3.4
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
