From patchwork Wed Mar 9 15:04:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 63717 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2696628lbc; Wed, 9 Mar 2016 07:05:06 -0800 (PST) X-Received: by 10.98.64.144 with SMTP id f16mr13353624pfd.159.1457535904257; Wed, 09 Mar 2016 07:05:04 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d3si4913735pas.116.2016.03.09.07.05.03; Wed, 09 Mar 2016 07:05:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932983AbcCIPFD (ORCPT + 4 others); Wed, 9 Mar 2016 10:05:03 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:33811 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932979AbcCIPFC (ORCPT ); Wed, 9 Mar 2016 10:05:02 -0500 Received: by mail-pa0-f42.google.com with SMTP id fe3so25761333pab.1 for ; Wed, 09 Mar 2016 07:05:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=mXG+ruykHMC/0bie5WgbZqzA5Y3mSWOB7hKtc5jJflE=; b=f060XtbBKCaCO0OR48WvhitsxH48nZKb24qKjlJeBqL9vJqnbLXFHzcaCu14+Opf9W hyjhmv1TrXeWOSbfM1LIqyyPAv3JqT4NWAHT9B2P+oEpDDFKdUVoJ5p0IF6vyvRP0JUN 5BkNyISIzFGFFkYPGmcD4BWXRmbn1GnwULKSw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mXG+ruykHMC/0bie5WgbZqzA5Y3mSWOB7hKtc5jJflE=; b=M52WksJSlmNxxBxQJI9vXQCODYm4nQezmxjCtjdlCabP7XA8CK+twKN1ItW+j/GWL3 NLc2JjjQjgmZ8n2286I0xoGKwZOv3a+FCX8N+J4yAC3E4mFTq1od1uUfOWj+USY4Zjl9 O/T3OuSZbHoQIh5gqT7x4pvxjNJA5VAmVMzQa5vpzHhOPWzmW3IobwUwTSno/TCzhSHR 8AdgkygYvKmMYgLAefXZAqXr252ePPUBnQgTzYuJH9O+O6Xdv/A8DNNIkKeSURiF/sLj y/FFwR1GipJ8aJLzwDzpiT+kkgiorUSUMcODvsX5LVzYkRiPt0veM3/kNl0NurW/iZO1 DRkQ== X-Gm-Message-State: AD7BkJLShku7g9RdGqM/8hWGNvXbaeMjupvGCObts5bMAbsUT93hG16ztuPredVS6Ko21zlf X-Received: by 10.66.120.202 with SMTP id le10mr50568579pab.155.1457535901684; Wed, 09 Mar 2016 07:05:01 -0800 (PST) Received: from 172-4-168-132.lightspeed.frokca.sbcglobal.net.net (110-170-137-3.static.asianet.co.th. [110.170.137.3]) by smtp.gmail.com with ESMTPSA id cq9sm13164856pac.26.2016.03.09.07.04.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Mar 2016 07:05:00 -0800 (PST) From: Linus Walleij To: linux-gpio@vger.kernel.org, Alexandre Courbot Cc: Linus Walleij , Lee Jones , "Andrew F. Davis" Subject: [PATCH] gpio: tps65912: fix bad merge Date: Wed, 9 Mar 2016 22:04:41 +0700 Message-Id: <1457535881-17994-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org I screwed up while merging the immutable branch for TPS65912, so fixing it unbroken again. Cc: Lee Jones Cc: Andrew F. Davis Signed-off-by: Linus Walleij --- drivers/gpio/gpio-tps65912.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/gpio/gpio-tps65912.c b/drivers/gpio/gpio-tps65912.c index e7886e712dc7..acfd30a13a56 100644 --- a/drivers/gpio/gpio-tps65912.c +++ b/drivers/gpio/gpio-tps65912.c @@ -117,8 +117,8 @@ static int tps65912_gpio_probe(struct platform_device *pdev) gpio->gpio_chip = template_chip; gpio->gpio_chip.parent = tps->dev; - ret = devm_gpiochip_add_data(&pdev->dev, &tps65912_gpio->gpio_chip, - tps65912_gpio); + ret = devm_gpiochip_add_data(&pdev->dev, &gpio->gpio_chip, + gpio); if (ret < 0) { dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret); return ret;