From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755208AbbLIJyF (ORCPT ); Wed, 9 Dec 2015 04:54:05 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:45466 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754814AbbLIJlZ (ORCPT ); Wed, 9 Dec 2015 04:41:25 -0500 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Geliang Tang , Sebastian Reichel , Luis Henriques Subject: [PATCH 3.16.y-ckt 096/126] hsi: fix double kfree Date: Wed, 9 Dec 2015 09:37:46 +0000 Message-Id: <1449653896-5236-97-git-send-email-luis.henriques@canonical.com> In-Reply-To: <1449653896-5236-1-git-send-email-luis.henriques@canonical.com> References: <1449653896-5236-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.16 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.7-ckt21 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Geliang Tang commit f098a045350ecd6045f2f2d5a50fecf2a98962d7 upstream. When device_register() fails, kfree() is called in hsi_client_release(), hence there is no need to call kfree in err3 again. Fixes: a2aa24734d9db ("HSI: Add common DT binding for HSI client devices") Signed-off-by: Geliang Tang Signed-off-by: Sebastian Reichel Signed-off-by: Luis Henriques --- drivers/hsi/hsi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/hsi/hsi.c b/drivers/hsi/hsi.c index fe9371271ce2..35d631e91908 100644 --- a/drivers/hsi/hsi.c +++ b/drivers/hsi/hsi.c @@ -300,7 +300,6 @@ static void hsi_add_client_from_dt(struct hsi_port *port, if (device_register(&cl->device) < 0) { pr_err("hsi: failed to register client: %s\n", name); put_device(&cl->device); - goto err3; } return;