diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-05-12 12:28:04 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-05-12 12:28:04 -0700 |
| commit | f4ff3be1263a9173d049a75c0ce8791e829f9e2f (patch) | |
| tree | 8341a968d85e5a12fc63eea1f2f799d09d961a0a /block | |
| parent | 775d71e49c65f1f6aa57776ea1da62988fc9a30a (diff) | |
| parent | 0f106b4f7fe6ad697cff5c02f0edd80bb066fabe (diff) | |
Merge branch 'upstream/linaro.38' into linaro-android.38
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-sysfs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 41fb69150b4..3655e193e60 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -511,8 +511,10 @@ int blk_register_queue(struct gendisk *disk) 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); |