From: Markus Elfring <[email protected]> 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 <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> [wt: backported only to ease next patch as suggested by Jiri] Signed-off-by: Willy Tarreau <[email protected]> --- 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 2a19097..d92ecf3 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -1138,8 +1138,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.8.0.rc2.1.gbe9624a
