From patchwork Sun Nov 24 20:06:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 3227021 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 75585C045B for ; Sun, 24 Nov 2013 20:07:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 94D8320429 for ; Sun, 24 Nov 2013 20:07:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C7FC82041F for ; Sun, 24 Nov 2013 20:07:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753510Ab3KXUHX (ORCPT ); Sun, 24 Nov 2013 15:07:23 -0500 Received: from mail-wg0-f50.google.com ([74.125.82.50]:46927 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753455Ab3KXUHT (ORCPT ); Sun, 24 Nov 2013 15:07:19 -0500 Received: by mail-wg0-f50.google.com with SMTP id a1so1193103wgh.17 for ; Sun, 24 Nov 2013 12:07:17 -0800 (PST) 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=zPI58cS/CVGw9bM7kLKqkGlITApKiZo0+HBG9zU+ODY=; b=ngEsF0dVAMsEHgHL/H9juB1b6rbA+xsYtcPrOXx6YCtFhSaH6I/jyjda7uqxaeott5 zw6pNcWqaQj5WulV69GYl4kZZETPVahl4TPn5PIwtOpdvIBcCEJU0ECvHOl90B8jzDBe NRM0ErOVBOX5qmB1m0qKYY4a5nllPyaBjSkOCKOeMQ5L/5ibVrANOnhCWZyAFrxkghLA QuHV/SSYvSAtsV9mQoRFCONKrydCkWOqy8eOFaSe0Fe+PZgRT1k5cU3bmHXsBbpGS4cv ZRpKmTCRQBlAUGrv4rnElefRQ3ER25afVH5Vpe0kqaqdV+4AutfGM3P6x3YEoYC7PMj5 Y31g== X-Received: by 10.180.37.11 with SMTP id u11mr10868998wij.27.1385323637947; Sun, 24 Nov 2013 12:07:17 -0800 (PST) Received: from localhost.localdomain (93-173-143-36.bb.netvision.net.il. [93.173.143.36]) by mx.google.com with ESMTPSA id bs15sm39450590wib.10.2013.11.24.12.07.16 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 24 Nov 2013 12:07:17 -0800 (PST) From: Emmanuel Grumbach To: linux-wireless@vger.kernel.org Cc: Luciano Coelho , Emmanuel Grumbach Subject: [PATCH 22/29] iwlwifi: mvm: don't restart HW if suspending fails before D3 image is loaded Date: Sun, 24 Nov 2013 22:06:39 +0200 Message-Id: <1385323606-3603-22-git-send-email-egrumbach@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <52925BE7.4050406@gmail.com> References: <52925BE7.4050406@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Luciano Coelho If we haven't loaded the D3 image yet and a failure in the suspend process occurs, we shouldn't restart the HW, because we're still running the D0 image. Signed-off-by: Luciano Coelho Reviewed-by: Johannes Berg Signed-off-by: Emmanuel Grumbach --- drivers/net/wireless/iwlwifi/mvm/d3.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/mvm/d3.c b/drivers/net/wireless/iwlwifi/mvm/d3.c index 6964b84..16d9103 100644 --- a/drivers/net/wireless/iwlwifi/mvm/d3.c +++ b/drivers/net/wireless/iwlwifi/mvm/d3.c @@ -1227,10 +1227,11 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw, mvm->aux_sta.sta_id = old_aux_sta_id; mvm_ap_sta->sta_id = old_ap_sta_id; mvmvif->ap_sta_id = old_ap_sta_id; - out_noreset: - kfree(key_data.rsc_tsc); + if (ret < 0) ieee80211_restart_hw(mvm->hw); + out_noreset: + kfree(key_data.rsc_tsc); mutex_unlock(&mvm->mutex);