diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-27 03:42:53 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-27 03:42:53 +0200 |
| commit | 4993632218e2202d4f110c8e83ae819ca26e6845 (patch) | |
| tree | 0872195b8c09b03d54adaaaf4304d1285091b031 /drivers/base/core.c | |
| parent | cpu: make sure that cpu/online file created before KOBJ_ADD is emitted (diff) | |
| parent | Linux 3.10-rc3 (diff) | |
| download | linux-4993632218e2202d4f110c8e83ae819ca26e6845.tar.xz linux-4993632218e2202d4f110c8e83ae819ca26e6845.zip | |
Merge 3.10-rc3 into driver-core-next
We want the changes here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/core.c')
| -rw-r--r-- | drivers/base/core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 3c8512f7b64c..0dbe02b3ce9d 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -572,9 +572,11 @@ int device_create_file(struct device *dev, if (dev) { WARN(((attr->attr.mode & S_IWUGO) && !attr->store), - "Write permission without 'store'\n"); + "Attribute %s: write permission without 'store'\n", + attr->attr.name); WARN(((attr->attr.mode & S_IRUGO) && !attr->show), - "Read permission without 'show'\n"); + "Attribute %s: read permission without 'show'\n", + attr->attr.name); error = sysfs_create_file(&dev->kobj, &attr->attr); } |