From patchwork Mon Jan 12 16:12:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 427794 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 78830140192 for ; Tue, 13 Jan 2015 03:13:05 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753549AbbALQMy (ORCPT ); Mon, 12 Jan 2015 11:12:54 -0500 Received: from mail-la0-f51.google.com ([209.85.215.51]:44412 "EHLO mail-la0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753454AbbALQMt (ORCPT ); Mon, 12 Jan 2015 11:12:49 -0500 Received: by mail-la0-f51.google.com with SMTP id ms9so24822045lab.10; Mon, 12 Jan 2015 08:12:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=fUf7vXJdhGHtnN70wGYfhvknfoVuhA/pVCwRWY2Evzc=; b=kTV8fNPGrYIZLJIMDTqeg+jb+0zFmVwZFHz7B++ymfLRvITwwxmy+76+byE+RL/nh4 zm7ebh2Wn9Uaryonh7mCPJ92BPTg4Ki891x1TM7Ht8fY/N6B4xKuvnElI7V6jXFkeNXX iEUvVtfiJZPJ5Tas34of8rEOo1MFk02F6G+V/RnqvsL4E21EV1EMNrKC7uZG6CYWut87 5Pp8hq40YJFOKDavvXOzwPtaJg889TJEMIaOHmypvA7lseO+ycECVoLlSAqD2jPiqPYS yynrldvOnr5WG2C+3PhTsV2U3DQMweiSoyhEZ0Y/eRb3V9G0nVkdP34eWsxdOhXTBKKO nlHg== X-Received: by 10.153.7.100 with SMTP id db4mr37459501lad.79.1421079167081; Mon, 12 Jan 2015 08:12:47 -0800 (PST) Received: from xi.terra (s83-177-171-8.cust.tele2.se. [83.177.171.8]) by mx.google.com with ESMTPSA id fb5sm4221629lbc.34.2015.01.12.08.12.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jan 2015 08:12:45 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.84) (envelope-from ) id 1YAhbp-0000bB-57; Mon, 12 Jan 2015 17:12:53 +0100 From: Johan Hovold To: Linus Walleij Cc: Alexandre Courbot , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable Subject: [PATCH 5/6] gpio: fix sleep-while-atomic in gpiochip_remove Date: Mon, 12 Jan 2015 17:12:28 +0100 Message-Id: <1421079149-2236-6-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.0.5 In-Reply-To: <1421079149-2236-1-git-send-email-johan@kernel.org> References: <1421079149-2236-1-git-send-email-johan@kernel.org> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Move direct and indirect calls to gpiochip_remove_pin_ranges outside of spin lock as they can end up taking a mutex in pinctrl_remove_gpio_range. Note that the pin ranges are already added outside of the lock. Fixes: 9ef0d6f7628b ("gpiolib: call pin removal in chip removal function") Fixes: f23f1516b675 ("gpiolib: provide provision to register pin ranges") Cc: stable Signed-off-by: Johan Hovold --- drivers/gpio/gpiolib.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 0f8173051edc..37f919dc2cb4 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -330,12 +330,10 @@ void gpiochip_remove(struct gpio_chip *chip) gpiochip_irqchip_remove(chip); acpi_gpiochip_remove(chip); - - spin_lock_irqsave(&gpio_lock, flags); - gpiochip_remove_pin_ranges(chip); of_gpiochip_remove(chip); + spin_lock_irqsave(&gpio_lock, flags); for (id = 0; id < chip->ngpio; id++) { if (test_bit(FLAG_REQUESTED, &chip->desc[id].flags)) dev_crit(chip->dev, "REMOVING GPIOCHIP WITH GPIOS STILL REQUESTED\n");