git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'upstream/master'
[pandora-kernel.git]
/
drivers
/
base
/
core.c
diff --git
a/drivers/base/core.c
b/drivers/base/core.c
index
7d5c63c
..
068aa1c
100644
(file)
--- a/
drivers/base/core.c
+++ b/
drivers/base/core.c
@@
-116,12
+116,10
@@
static void device_release(struct kobject *kobj)
dev->type->release(dev);
else if (dev->class && dev->class->dev_release)
dev->class->dev_release(dev);
dev->type->release(dev);
else if (dev->class && dev->class->dev_release)
dev->class->dev_release(dev);
- else
{
-
printk(
KERN_ERR "Device '%s' does not have a release() "
+ else
+
WARN(1,
KERN_ERR "Device '%s' does not have a release() "
"function, it is broken and must be fixed.\n",
dev->bus_id);
"function, it is broken and must be fixed.\n",
dev->bus_id);
- WARN_ON(1);
- }
}
static struct kobj_type device_ktype = {
}
static struct kobj_type device_ktype = {