From patchwork Fri Jan 30 10:26:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 434799 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 28D8A1402AC for ; Fri, 30 Jan 2015 21:26:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761181AbbA3K0e (ORCPT ); Fri, 30 Jan 2015 05:26:34 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:56642 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761166AbbA3K0a (ORCPT ); Fri, 30 Jan 2015 05:26:30 -0500 Received: by mail-pa0-f46.google.com with SMTP id lj1so50802661pab.5 for ; Fri, 30 Jan 2015 02:26:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:subject:from:to:cc:date:content-type :mime-version:content-transfer-encoding; bh=44mjXZ8bp7yWOXVuguvokx8v2Lda/XA7EroLii8/V/I=; b=K88ZVax1Na5tYiHIh7GUBcyEQGnC6VtruDA2p8BRs9TCU8qa+/4CqkjsP2MKT5yCXh vlu3GQNzVMRyVdz/SV4ARi8eRThqV366u2gu49EoTbR0ivpazLPbw3kzzJyFIiBWaE0P BbRCkY1vCldRYMUxYwDXxO2JOq/UGfRPjBb+cxvqn12bprNJuBQSFGDC1ra7bSnHQQRu pB0OC3Q5A3vGfwrLMLYdUZbfP2DTrbAQIB4qCMVh0XnNf4UDcEQ/eRNUG2NbWGClFCBS 4DXPZ5dmjFOdpqtwFn/puInHfhyOCXVFqePy2Ei3uQZsAhtcTaVVWlGOCwOLUrM3K915 VwNQ== X-Gm-Message-State: ALoCoQl5empWgWNfS2m5DiCtcekRARhoFg/7bjuwjjjDkDyZ9W3MfKwFgT3dAfZckNVblo2hS3I7 X-Received: by 10.68.195.65 with SMTP id ic1mr7588023pbc.109.1422613589901; Fri, 30 Jan 2015 02:26:29 -0800 (PST) Received: from [192.168.0.102] (218-164-131-6.dynamic.hinet.net. [218.164.131.6]) by mx.google.com with ESMTPSA id mb6sm7152072pdb.33.2015.01.30.02.26.27 (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Fri, 30 Jan 2015 02:26:29 -0800 (PST) Message-ID: <1422613585.24393.1.camel@phoenix> Subject: [PATCH RFT] gpio: mb86s70: Return error if requesting an already assigned gpio From: Axel Lin To: Linus Walleij , Alexandre Courbot Cc: Jassi Brar , Andy Green , Vincent Yang , Tetsuya Nuriya , "linux-gpio@vger.kernel.org" Date: Fri, 30 Jan 2015 18:26:25 +0800 X-Mailer: Evolution 3.10.4-0ubuntu2 Mime-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Signed-off-by: Axel Lin --- drivers/gpio/gpio-mb86s7x.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpio/gpio-mb86s7x.c b/drivers/gpio/gpio-mb86s7x.c index 21b1ce5..ee93c0a 100644 --- a/drivers/gpio/gpio-mb86s7x.c +++ b/drivers/gpio/gpio-mb86s7x.c @@ -58,6 +58,11 @@ static int mb86s70_gpio_request(struct gpio_chip *gc, unsigned gpio) spin_lock_irqsave(&gchip->lock, flags); val = readl(gchip->base + PFR(gpio)); + if (!(val & OFFSET(gpio))) { + spin_unlock_irqrestore(&gchip->lock, flags); + return -EINVAL; + } + val &= ~OFFSET(gpio); writel(val, gchip->base + PFR(gpio));