From patchwork Sun Mar 10 18:58:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Van Asbroeck X-Patchwork-Id: 10846431 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 07850922 for ; Sun, 10 Mar 2019 18:58:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4AF828E8E for ; Sun, 10 Mar 2019 18:58:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D8E1328F63; Sun, 10 Mar 2019 18:58:52 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9593328E8E for ; Sun, 10 Mar 2019 18:58:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=amOzr/0a/mzcW6uXTQ47jp7LyFmIFmKETRNFV4Uef7s=; b=pEX80egEA2wlEtKGJHyitKh39N qzUof+GYsHCgGnj79wHjX/amarF3txcIna8rca5c5GRZ9++Yyk1xLWUBpcQZ66hbHHHTCBJYFjKsb nifenEyhl9J1r9dDW1uaiCORnTBFdNfVDrYzWJ1GFdy9doBbwLypFj8xloy29ILwF91iGCCuv3EH3 OuYtPvS2DPT/AEaOlFHHyIs1/cUqiF/z8DpN9RFc/lFS7Cq+k7L8bvttNQJrsK9DyPKHhMmE+8NDo nyIs5evo0rRqXyAVyxTqZTLxOA2ZGvAqSvEDn5I5LKvCjL7hU98eVhTX3xHxQzHVX3u6/5VORprTC o/HpME+w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h33en-0008OU-Du; Sun, 10 Mar 2019 18:58:45 +0000 Received: from mail-io1-xd44.google.com ([2607:f8b0:4864:20::d44]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h33ef-0008Hl-8k for linux-arm-kernel@lists.infradead.org; Sun, 10 Mar 2019 18:58:38 +0000 Received: by mail-io1-xd44.google.com with SMTP id b6so2149667iog.0 for ; Sun, 10 Mar 2019 11:58:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AKnYvAqiueyTkKUcdTkd4DRK5HdxIHd2jyBD4bgdo24=; b=LEcm4H+N5lKvwRTSirKOLAz0B20Ev2XEim3/Zz8A/npstz0aaynTtwhYqEsMzXVPF2 u0Wd0Av59wTMsOaJx9LLvq6J7NyGgpEwY7vNrws6dNwm/tp8GtsJ1PBxDMs7S8PdRmpd k64uvCARYN6yYomorJRuume0v5a2hjcr3SK4CvW7auUnIXnhGDDAHHcDVtQJzQngf7SC s5v0EKAXNQfSxOz2G1f76W/5NJxoN25YHbA9z7PzoyvFYikMJvRr57vqyMMeI0BzIvSF pTdMd5ZuAP0pn8d1TY9D3Us08vCRYytQQZJI8NnHkhUpXa7jjdWPoQs6zz8FEAg01Dhv zRuw== 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=AKnYvAqiueyTkKUcdTkd4DRK5HdxIHd2jyBD4bgdo24=; b=C8NfJPyZXFCDNCXF5YVsAgcLQCBFsszr8Y+l8zo/AYlDtSQR3RNG4bBEAs9RY0EHER rr8zfxVE+ebooCWgTMxsucV3QtofY2uFRGcsPljh/yuTj65Af2gfXd4yncBe94/wENLY fRyxCpscSVfd2h5eoDY1FVuYCRP3LIlzbOqciA5jpjKbVXp8QecTIuavgl20/l5C8jpI 2WoJO04+Mlpxo/GtQ2NuUj1AeEvNKEPRYo21BgvcsEYkqEwJ2WKcp9dCIKSP0lvzzuVX WX7lTnSoHUnJY28un1CCMPMOMA52Rh8RhZyHsxCYSZafylsNLAp2LrwcrK4nRThoQZEL rsuA== X-Gm-Message-State: APjAAAXXuaTBtgggO5yreGsCV4dm+MYM/v+UAe+IwMmhmSmKd+g3PQ5s dV6hMmRvlAZddjuxDYWa9ik= X-Google-Smtp-Source: APXvYqy9VrS0bd+iQ9v7QZ4H98ZpTtpJnlQx6I9TmGD6jxLSQ+Fbofc/4zoq4KxCxZfTr4halfn6ag== X-Received: by 2002:a5e:d819:: with SMTP id l25mr13651049iok.27.1552244316537; Sun, 10 Mar 2019 11:58:36 -0700 (PDT) Received: from localhost.localdomain ([198.52.185.227]) by smtp.gmail.com with ESMTPSA id y18sm1359270ioa.56.2019.03.10.11.58.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Mar 2019 11:58:36 -0700 (PDT) From: Sven Van Asbroeck X-Google-Original-From: Sven Van Asbroeck To: Jonathan Cameron Subject: [PATCH 3/3] iio: adc: xilinx: prevent touching unclocked h/w on remove Date: Sun, 10 Mar 2019 14:58:26 -0400 Message-Id: <20190310185826.25916-3-TheSven73@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190310185826.25916-1-TheSven73@gmail.com> References: <20190310185826.25916-1-TheSven73@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190310_115837_303215_CF4B74CC X-CRM114-Status: GOOD ( 13.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lars-Peter Clausen , linux-iio@vger.kernel.org, Michal Simek , linux-kernel@vger.kernel.org, Manish Narani , Peter Meerwald-Stadler , Hartmut Knaack , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In remove, the clock is disabled before canceling the delayed work. This means that the delayed work may be touching unclocked hardware. Fix by disabling the clock after the delayed work is fully canceled. This is consistent with the probe error path order. Signed-off-by: Sven Van Asbroeck --- drivers/iio/adc/xilinx-xadc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c index 15e1a103f37d..1ae86e7359f7 100644 --- a/drivers/iio/adc/xilinx-xadc-core.c +++ b/drivers/iio/adc/xilinx-xadc-core.c @@ -1320,8 +1320,8 @@ static int xadc_remove(struct platform_device *pdev) iio_triggered_buffer_cleanup(indio_dev); } free_irq(xadc->irq, indio_dev); - clk_disable_unprepare(xadc->clk); cancel_delayed_work_sync(&xadc->zynq_unmask_work); + clk_disable_unprepare(xadc->clk); kfree(xadc->data); kfree(indio_dev->channels);