From patchwork Wed Apr 5 10:32:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96824 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp196264qgd; Wed, 5 Apr 2017 03:34:08 -0700 (PDT) X-Received: by 10.84.232.79 with SMTP id f15mr34818717pln.90.1491388448232; Wed, 05 Apr 2017 03:34:08 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j29si20238630pgn.377.2017.04.05.03.34.08; Wed, 05 Apr 2017 03:34:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933498AbdDEKeG (ORCPT + 6 others); Wed, 5 Apr 2017 06:34:06 -0400 Received: from mail-pf0-f170.google.com ([209.85.192.170]:33824 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933486AbdDEKde (ORCPT ); Wed, 5 Apr 2017 06:33:34 -0400 Received: by mail-pf0-f170.google.com with SMTP id 197so5603083pfv.1 for ; Wed, 05 Apr 2017 03:33:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pL8UdHid6fe21wcMh+Y6hAW8vWBXpxHPy2fOfxMRqwQ=; b=V/puuvOAe+HdjIWO2I+hWXGfG8NBPURaIfdgNUSK7K7XWuHCyhZaHQBFbDdcA22Awi yObRTEYwTXfzM/06cQKtJQl0jKdAVWGoI3EqwgmQPS5UJY1gfhhZ8HCUSDuer0VqS30A ghyNcqxN1IEYbrulf8VsJcXVl4QoVASvOPyPk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pL8UdHid6fe21wcMh+Y6hAW8vWBXpxHPy2fOfxMRqwQ=; b=Q014qTIKMKr4qUwUrmorTwte/7lh1sG1pxnY+88ey94HVR8wkMyvT/yQLzfnsxacmN 0uqHgXaw6Fv9SGVSpygkISSBkdV0CSK15E7AmzsepHu/gASQH4gR0WRePQO401hSdMV5 ITbRoczpEUKUvctUaeWEInXMIPj9qzI6X3FlhTEFccGzyMzcnzJHeaIqVxklySsz+C5c gjQTaXaViqseKR36jdQQb5+fBhWbIz42FMm9dfHj6TeYEfOy4bs3Gz36o6dXY5r41W8J DBrS8dTxm5opXkK0SP4sKxBQzCH9SAGYNihlShXFsEM2u0fBBzmFnh9Oh19qx4Ldtui8 r44A== X-Gm-Message-State: AFeK/H2Jpkbq0zBm2tfSMtslRxkE19f4HXxfcXfMug//3x5TOPg/RCEknf2wRW4wk+vAF4OR X-Received: by 10.99.99.1 with SMTP id x1mr29865278pgb.110.1491388414191; Wed, 05 Apr 2017 03:33:34 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id a62sm36732075pgc.60.2017.04.05.03.33.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Apr 2017 03:33:33 -0700 (PDT) From: Amit Pundir To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org, Vishal Thanki , Kalle Valo Subject: [PATCH v2 for-4.9 31/32] rt2x00: Fix incorrect usage of CONFIG_RT2X00_LIB_USB Date: Wed, 5 Apr 2017 16:02:23 +0530 Message-Id: <1491388344-13521-32-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491388344-13521-1-git-send-email-amit.pundir@linaro.org> References: <1491388344-13521-1-git-send-email-amit.pundir@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vishal Thanki In device removal routine, usage of "#ifdef CONFIG_RT2X00_LIB_USB" will not cover the case when it is configured as module. This will omit the entire if-block which does cleanup of URBs and cancellation of pending work. Changing the #ifdef to #if IS_ENABLED() to fix it. Signed-off-by: Vishal Thanki Acked-by: Stanislaw Gruszka Signed-off-by: Kalle Valo (cherry picked from commit a083c8fd277b4122c804f18ec8c84165f345c71c) Signed-off-by: Amit Pundir --- drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c index 4e0c565..b7273be 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c @@ -1422,7 +1422,7 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) cancel_work_sync(&rt2x00dev->intf_work); cancel_delayed_work_sync(&rt2x00dev->autowakeup_work); cancel_work_sync(&rt2x00dev->sleep_work); -#ifdef CONFIG_RT2X00_LIB_USB +#if IS_ENABLED(CONFIG_RT2X00_LIB_USB) if (rt2x00_is_usb(rt2x00dev)) { usb_kill_anchored_urbs(rt2x00dev->anchor); hrtimer_cancel(&rt2x00dev->txstatus_timer);