From 73d96672d758800998d79639b4614b981cca4e07 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 14 Jan 2010 22:54:37 +0100 Subject: [PATCH] --- yaml --- r: 187063 b: refs/heads/master c: 3f5468c9ae293cbca43e4ffe6ca3b3235189042a h: refs/heads/master i: 187061: c439bee0c0533bc3ca499c9b07e575946c6a1b29 187059: 45913698257f01c14f64eab61e937a0bea489a9f 187055: f9ddaafc1bb4ea9472f65b0208771f79b9dfc53a v: v3 --- [refs] | 2 +- trunk/drivers/base/core.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index a75008ba5775..ce76cc782cb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7934779a69f1184f29d786b89e77dd14519bd226 +refs/heads/master: 3f5468c9ae293cbca43e4ffe6ca3b3235189042a diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c index fb4bc4f5151c..f6c73a9e3d95 100644 --- a/trunk/drivers/base/core.c +++ b/trunk/drivers/base/core.c @@ -306,15 +306,10 @@ static ssize_t store_uevent(struct device *dev, struct device_attribute *attr, { enum kobject_action action; - if (kobject_action_type(buf, count, &action) == 0) { + if (kobject_action_type(buf, count, &action) == 0) kobject_uevent(&dev->kobj, action); - goto out; - } - - dev_err(dev, "uevent: unsupported action-string; this will " - "be ignored in a future kernel version\n"); - kobject_uevent(&dev->kobj, KOBJ_ADD); -out: + else + dev_err(dev, "uevent: unknown action-string\n"); return count; }