From patchwork Fri Jun 16 03:34:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Greer X-Patchwork-Id: 9790471 X-Patchwork-Delegate: sameo@linux.intel.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B060960231 for ; Fri, 16 Jun 2017 03:41:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 947351FF81 for ; Fri, 16 Jun 2017 03:41:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 87FD51FE6A; Fri, 16 Jun 2017 03:41:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 531CC1FE6A for ; Fri, 16 Jun 2017 03:40:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751762AbdFPDk4 (ORCPT ); Thu, 15 Jun 2017 23:40:56 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:44123 "EHLO out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751641AbdFPDky (ORCPT ); Thu, 15 Jun 2017 23:40:54 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 4317D207B0; Thu, 15 Jun 2017 23:34:27 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute3.internal (MEProxy); Thu, 15 Jun 2017 23:34:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=animalcreek.com; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=G1q I/dgstQFcFhdYeAfvqbuipZXydz0u/OjKsbrIc3w=; b=T1IdhVlgYcgMWC5076l PxeBK8C6AXrBY/xKZ1i8iZaNjtLfER6N0SRfS63/KNUwBLA9mK+EybfLgF92Zs4X 6j08q4zkXpTy6KRE/IT2WtkTu8OSI9U2c2rdyySV/5mAyPjG5ThUXMPJvnqjvyw6 /U9UTzUHTmnDS6jTNvgWnQ1A= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=G1qI/dgstQFcFhdYeAfvqbuipZXydz0u/OjKsbrIc 3w=; b=EZaBSbmXkQmi8oDhnmllRNcZrTphy6m1101Cq7z6E38FbuqcwveVvnNec GkmiThrjdTPrk96h+OJJniXM67B1+Lq3wSgLFGgUXKgaCOff1tH+9WiAN5/j41Bi Hi+I5m6UeTseh5X/GNq2+zIzCOxzn/taY7Zj/3yupvjlU7h3P86dMZ2OYI544LMe qKPeS4EKdADVZWwBOGPs91KPo6RMXgjmpVodtmMVhfoatILsR1IT1XNlnQd2CNLG uc+90ej4mGvA/stRAuyH4N/q1BMMJsYvkhuZuKhP+SNEyOrtJjowO2vtT7p9wlVM hkaLLn0/S+23y1gkZe8pFzDICBz5A== X-ME-Sender: X-Sasl-enc: glubv5UkbGR50xj/23CSySOa9kK7ZHyCxCkSyw5ci7Tj 1497584067 Received: from blue.animalcreek.com (ip68-2-81-12.ph.ph.cox.net [68.2.81.12]) by mail.messagingengine.com (Postfix) with ESMTPA id 00B3C2494B; Thu, 15 Jun 2017 23:34:27 -0400 (EDT) Received: from blue.animalcreek.com (localhost [127.0.0.1]) by blue.animalcreek.com (Postfix) with ESMTP id 455AFA2029A; Thu, 15 Jun 2017 20:34:26 -0700 (MST) From: Mark Greer To: Samuel Ortiz Cc: linux-wireless@vger.kernel.org, linux-nfc@lists.01.org, Mark Greer Subject: [PATCH 1/2] NFC: digital: Abort cmd when deactivating target Date: Thu, 15 Jun 2017 20:34:21 -0700 Message-Id: <20170616033422.18484-2-mgreer@animalcreek.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170616033422.18484-1-mgreer@animalcreek.com> References: <20170616033422.18484-1-mgreer@animalcreek.com> Organization: Animal Creek Technologies, Inc. Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When deactivating an active target, the outstanding command should be aborted. Signed-off-by: Mark Greer --- net/nfc/digital_core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/nfc/digital_core.c b/net/nfc/digital_core.c index 0fd5518bf252..145dd74927c4 100644 --- a/net/nfc/digital_core.c +++ b/net/nfc/digital_core.c @@ -650,6 +650,7 @@ static void digital_deactivate_target(struct nfc_dev *nfc_dev, return; } + digital_abort_cmd(ddev); ddev->curr_protocol = 0; }