From patchwork Sat May 23 21:16:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 6470751 X-Patchwork-Delegate: kvalo@adurom.com 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A9EE5C0020 for ; Sat, 23 May 2015 21:17:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 83C9C2050E for ; Sat, 23 May 2015 21:17:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5978F2050B for ; Sat, 23 May 2015 21:17:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758092AbbEWVRD (ORCPT ); Sat, 23 May 2015 17:17:03 -0400 Received: from mail-ob0-f180.google.com ([209.85.214.180]:36670 "EHLO mail-ob0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751324AbbEWVRA (ORCPT ); Sat, 23 May 2015 17:17:00 -0400 Received: by obbea2 with SMTP id ea2so33915966obb.3; Sat, 23 May 2015 14:16:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=2EFKf4SuunJ4pwBU8WMP4TZjp65FmdBaaKVPzp3U0o0=; b=V9Mx3ZGfS8ljFB+5rBUGwTclIfj1Ue/UgIo6x+0Ay3c+zLiYZXe7/1+wHFLI1PiVKA fxn2YWEJiBRa3OKdmWZrX4ta2xCDb9DELNV5uVNUCk54hljgn0bGryc+i0cYgy1guQpz lGW2nhtWFP93JeItvqVJCAF6nHXIKUVmPeZ3a8qRn802Pg3KX/bRLQxyZ6cN1wXi5WnP /Q8d+TvmIk1/YhlsHXKK5FQro/4Sq5+LrV4A47zPxQu9fmJyF9KwLlMB7UOAreXFlVXM BeRz1maiqGKTUv19vgBWo6CWmWhpPBqhupqAc9rM5jn1VQFvdc7o3+lyStTv/+kHStcc csWg== X-Received: by 10.202.193.8 with SMTP id r8mr11154367oif.27.1432415819936; Sat, 23 May 2015 14:16:59 -0700 (PDT) Received: from linux.site.site (cpe-72-133-230-77.kc.res.rr.com. [72.133.230.77]) by mx.google.com with ESMTPSA id lz12sm589866oeb.4.2015.05.23.14.16.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 23 May 2015 14:16:58 -0700 (PDT) From: Larry Finger To: gregkh@linuxfoundation.org Cc: netdev@vger.kernel.org, devel@driverdev.osuosl.org, Larry Finger , linux-wireless@vger.kernel.org, Stable , Haggi Eran Subject: [PATCH] staging: r8712u: Fix kernel warning for improper call of del_timer_sync() Date: Sat, 23 May 2015 16:16:52 -0500 Message-Id: <1432415812-1285-1-git-send-email-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.1.4 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_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable 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 The driver is reporting a warning at kernel/time/timer.c:1096 due to calling del_timer_sync() while in interrupt mode. Such warnings are fixed by calling del_timer() instead. Signed-off-by: Larry Finger Cc: Stable Cc: Haggi Eran --- drivers/staging/rtl8712/rtl8712_led.c | 2 +- drivers/staging/rtl8712/rtl871x_mlme.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8712/rtl8712_led.c b/drivers/staging/rtl8712/rtl8712_led.c index f1d47a0..8cc716c 100644 --- a/drivers/staging/rtl8712/rtl8712_led.c +++ b/drivers/staging/rtl8712/rtl8712_led.c @@ -921,7 +921,7 @@ static void SwLedControlMode1(struct _adapter *padapter, IS_LED_WPS_BLINKING(pLed)) return; if (pLed->bLedNoLinkBlinkInProgress == true) { - del_timer_sync(&pLed->BlinkTimer); + del_timer(&pLed->BlinkTimer); pLed->bLedNoLinkBlinkInProgress = false; } if (pLed->bLedBlinkInProgress == true) { diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c index fb2b195..ace88ab 100644 --- a/drivers/staging/rtl8712/rtl871x_mlme.c +++ b/drivers/staging/rtl8712/rtl871x_mlme.c @@ -582,7 +582,7 @@ void r8712_surveydone_event_callback(struct _adapter *adapter, u8 *pbuf) spin_lock_irqsave(&pmlmepriv->lock, irqL); if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) { - del_timer_sync(&pmlmepriv->scan_to_timer); + del_timer(&pmlmepriv->scan_to_timer); _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); } @@ -910,7 +910,7 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf) if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) r8712_indicate_connect(adapter); - del_timer_sync(&pmlmepriv->assoc_timer); + del_timer(&pmlmepriv->assoc_timer); } else goto ignore_joinbss_callback; } else {