From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934809AbdA0MFg (ORCPT ); Fri, 27 Jan 2017 07:05:36 -0500 Received: from mx2.suse.de ([195.135.220.15]:59546 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932531AbdA0K4e (ORCPT ); Fri, 27 Jan 2017 05:56:34 -0500 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Markus Elfring , Greg Kroah-Hartman , Jiri Slaby Subject: [PATCH 3.12 001/235] driver core: Delete an unnecessary check before the function call "put_device" Date: Fri, 27 Jan 2017 11:52:14 +0100 Message-Id: <5b46dc789ca2be4046e4e40a131858d386cac741.1485514374.git.jslaby@suse.cz> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring 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 Signed-off-by: Greg Kroah-Hartman Signed-off-by: Jiri Slaby --- 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