Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp84915imu; Wed, 21 Nov 2018 15:51:54 -0800 (PST) X-Google-Smtp-Source: AFSGD/VX7YWq+sni5GQuZZGcKK3XmPSf9bNM5V97YFz99GlLHGLxxHejlVkABWGKTI0rEVkxUap0 X-Received: by 2002:a63:94:: with SMTP id 142mr7724304pga.74.1542844314305; Wed, 21 Nov 2018 15:51:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542844314; cv=none; d=google.com; s=arc-20160816; b=xLtITX6/xYc2Csf9Xy4+x39A7AfwqUHefk5EM1wiNRAn5ORgrB8jDRs70Mt9L7Z7lm U9dYsh96sX56yESQrHNnOygUJm1vV+eOkUgE4xuPoJ2J5cv9lacXGRUfEcPHYWiaOPby z4F/8zRGUC0KXA/1Rzch7nrGPS5wS8l04HWK0+Wadp+Jm8mS09xEJChH3KsjEYnalnOi VgiA44StOUYrBn9aEEvbgHULu3UEl2QwiJojSjcEVJpogqVtXjZM2pvvVU/sZpkqaPnc 1QP0KFT6GZnZey9fjTmdE2+mXrwEBRcIjnuBl30nKCC7TgVKm9xPY3nBI7lZQDxNNzEH /XzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=apWLRL4EES9itQ1IvF4PtA4CQJXRRqLu3iQrnOX/Gj4=; b=vwFUwcESW4jZrniTo1wcwjNI7VlvMtVtOucwJNkgm6NndFw4q3uqPkaQUNDF9HiZF5 ppdv3lT83GWCrYpCcwbp8yhSyiWIHgYLQbdmjUp+5pHK7I7lTf5mgwEMTCtKSKq9OQbd 8B2ureGCaLuLVx8IWio9VG3qqv/e6gP1ipXQftM8FkwES8RNqlTQyZrlYvcqcuH4r2L/ DPfXTdM/KsVCJDutVSdwit+4OsJwCsVgEG03tEwoLAG6XsxwVradN82ZNGAK/b8NRJ67 R1cRVdFmMBi/0loT+79JdNx1OFYw68s/RJnE6wkvrWnXo6XuX/ViTUIiG1BWJejvB4LE qhRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="D/biwson"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i20si41798914pgm.586.2018.11.21.15.51.39; Wed, 21 Nov 2018 15:51:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="D/biwson"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388232AbeKVFo3 (ORCPT + 99 others); Thu, 22 Nov 2018 00:44:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:38992 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726862AbeKVFo2 (ORCPT ); Thu, 22 Nov 2018 00:44:28 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BFF10214D9; Wed, 21 Nov 2018 19:08:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542827335; bh=0k8KAoLCuUq4rhMgAODQwCMhP6oCFGup1BiTIiKj5xY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D/biwsonxHYpmMisgshOi7GvsC9/EQFuZE428GiUpaa9+TQ4Mh3sRi3hV4Az3CcTh pcBdOP53lgkAwc51GEy7hSmM3ST96aCs48roZDiAYgDXcv/FbkXvBBDc8MecO2QeYL bfUwCP9C6lM8PE5Nahp2/4zolqSkokAgXSMls7WA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tristram Ha , Pavel Machek , Andrew Lunn , Florian Fainelli , "David S. Miller" Subject: [PATCH 4.14 11/21] net: dsa: microchip: initialize mutex before use Date: Wed, 21 Nov 2018 20:06:55 +0100 Message-Id: <20181121183422.540905822@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181121183422.103826775@linuxfoundation.org> References: <20181121183422.103826775@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tristram Ha [ Upstream commit 284fb78ed7572117846f8e1d1d8e3dbfd16880c2 ] Initialize mutex before use. Avoid kernel complaint when CONFIG_DEBUG_LOCK_ALLOC is enabled. Fixes: b987e98e50ab90e5 ("dsa: add DSA switch driver for Microchip KSZ9477") Signed-off-by: Tristram Ha Reviewed-by: Pavel Machek Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/dsa/microchip/ksz_common.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -1104,11 +1104,6 @@ static int ksz_switch_init(struct ksz_de { int i; - mutex_init(&dev->reg_mutex); - mutex_init(&dev->stats_mutex); - mutex_init(&dev->alu_mutex); - mutex_init(&dev->vlan_mutex); - dev->ds->ops = &ksz_switch_ops; for (i = 0; i < ARRAY_SIZE(ksz_switch_chips); i++) { @@ -1193,6 +1188,11 @@ int ksz_switch_register(struct ksz_devic if (dev->pdata) dev->chip_id = dev->pdata->chip_id; + mutex_init(&dev->reg_mutex); + mutex_init(&dev->stats_mutex); + mutex_init(&dev->alu_mutex); + mutex_init(&dev->vlan_mutex); + if (ksz_switch_detect(dev)) return -EINVAL;