From patchwork Fri Mar 14 09:07:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 330231 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 05BD82C010A for ; Fri, 14 Mar 2014 20:08:19 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755967AbaCNJH6 (ORCPT ); Fri, 14 Mar 2014 05:07:58 -0400 Received: from mail-ee0-f49.google.com ([74.125.83.49]:50058 "EHLO mail-ee0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755834AbaCNJH4 (ORCPT ); Fri, 14 Mar 2014 05:07:56 -0400 Received: by mail-ee0-f49.google.com with SMTP id c41so1087522eek.8 for ; Fri, 14 Mar 2014 02:07:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z9rTDtMca/WMk03FNZKbkU5CUgp1xMKkJFbIuO9aS5U=; b=h68ggQNM7IEIjA8i8K9LAfjCDApsuptWvPk2cGsc+Kkw+SN4L1Sx5T5SZRCMrqNI3w 9C58zgjN5g5AhGJGEIa5pLkz0gH61u4+ycPd5CDzr7Q4owopzMgfnoy7Ksq4BIi9S/dr SwgrWriU9UrHTXSa2s8eg0CE0fd9YikM/yvF/3xqj0aV4wL5vUDE1hYX9azMALxxPeO0 8yaGVISzVv8ikMnizpxa+MSkwukTFeyc/EavvCQgAbAT8lriqMoK56q8I4i4+bUpnm04 mI22xp8z436QY0N91sS+OsBDt6KR39lU3VM/IGcW9909M/WK3Gyj5CoKjlN4iCG2J7N7 z85A== X-Received: by 10.15.51.1 with SMTP id m1mr7207134eew.25.1394788074991; Fri, 14 Mar 2014 02:07:54 -0700 (PDT) Received: from topkick.lan (dslc-082-083-251-183.pools.arcor-ip.net. [82.83.251.183]) by mx.google.com with ESMTPSA id m1sm15777777een.7.2014.03.14.02.07.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Mar 2014 02:07:54 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Cc: David Miller , Florian Fainelli , Ben Hutchings , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: phy: fix uninitalized ethtool_wolinfo in phy_suspend Date: Fri, 14 Mar 2014 10:07:44 +0100 Message-Id: <1394788064-6832-1-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <20140313.153832.967564223480298567.davem@davemloft.net> References: <20140313.153832.967564223480298567.davem@davemloft.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Callers of phy_ethtool_get_wol are supposed to provide a properly cleared struct ethtool_wolinfo. Therefore, fix phy_suspend to clear it before passing it to phy_ethtool_get_wol. Signed-off-by: Sebastian Hesselbarth Reviewed-by: Ben Hutchings --- Cc: David Miller Cc: Florian Fainelli Cc: Ben Hutchings Cc: netdev@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/net/phy/phy_device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 4b03e63639b7..7512e28866f1 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -683,10 +683,9 @@ EXPORT_SYMBOL(phy_detach); int phy_suspend(struct phy_device *phydev) { struct phy_driver *phydrv = to_phy_driver(phydev->dev.driver); - struct ethtool_wolinfo wol; + struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL }; /* If the device has WOL enabled, we cannot suspend the PHY */ - wol.cmd = ETHTOOL_GWOL; phy_ethtool_get_wol(phydev, &wol); if (wol.wolopts) return -EBUSY;