--- block/blk-sysfs.c

+++ block/blk-sysfs.c

@@ -440,8 +440,10 @@ int blk_register_queue(struct gendisk *d

return ret;

ret = kobject_add(&q->kobj, kobject_get(&dev->kobj), "%s", "queue");

- if (ret < 0)

+ if (ret < 0) {

+ blk_trace_remove_sysfs(dev);

return ret;

+ }

kobject_uevent(&q->kobj, KOBJ_ADD);