diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-05-10 01:25:18 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-05-10 01:25:18 -0700 |
| commit | 6e5dae3ae1af25ac48b005ccfb2cf7e033d312ce (patch) | |
| tree | ae877abfc5e691423dd5dbafab2a2eda81760e58 /lib/kobject.c | |
| parent | d7521d9bb9408dd4225b9838e23a80ecc41f80fa (diff) | |
| parent | 028ce831e8f14cc94f14929f1a91d198ea2d9b93 (diff) | |
Merge "Merge android-4.4.131 (d5d6526) into msm-4.4"
Diffstat (limited to 'lib/kobject.c')
| -rw-r--r-- | lib/kobject.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index 7cbccd2b4c72..895edb63fba4 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -234,14 +234,12 @@ static int kobject_add_internal(struct kobject *kobj) /* be noisy on error issues */ if (error == -EEXIST) - WARN(1, "%s failed for %s with " - "-EEXIST, don't try to register things with " - "the same name in the same directory.\n", - __func__, kobject_name(kobj)); + pr_err("%s failed for %s with -EEXIST, don't try to register things with the same name in the same directory.\n", + __func__, kobject_name(kobj)); else - WARN(1, "%s failed for %s (error: %d parent: %s)\n", - __func__, kobject_name(kobj), error, - parent ? kobject_name(parent) : "'none'"); + pr_err("%s failed for %s (error: %d parent: %s)\n", + __func__, kobject_name(kobj), error, + parent ? kobject_name(parent) : "'none'"); } else kobj->state_in_sysfs = 1; |