From: Markus Elfring <elfr...@users.sourceforge.net> 3.12-stable review patch. If anyone has any objections, please let me know.
=============== commit 5f0163a5ee9cc7c59751768bdfd94a73186debba upstream. The put_device() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> Signed-off-by: Jiri Slaby <jsl...@suse.cz> --- drivers/base/core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 944fecd32e9f..90458b1719a8 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -1185,8 +1185,7 @@ done: kobject_del(&dev->kobj); Error: cleanup_device_parent(dev); - if (parent) - put_device(parent); + put_device(parent); name_error: kfree(dev->p); dev->p = NULL; -- 2.11.0