From patchwork Wed Sep 12 21:27:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Pereira da Silva X-Patchwork-Id: 1446891 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D197F3FCFC for ; Wed, 12 Sep 2012 21:27:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753817Ab2ILV1b (ORCPT ); Wed, 12 Sep 2012 17:27:31 -0400 Received: from mail-gh0-f174.google.com ([209.85.160.174]:53401 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753529Ab2ILV1a (ORCPT ); Wed, 12 Sep 2012 17:27:30 -0400 Received: by ghbg15 with SMTP id g15so531096ghb.19 for ; Wed, 12 Sep 2012 14:27:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=gaLEJguybeL7HG1zEKLHAGUYyRmd5cJpZz4m0w7ILBQ=; b=Iis+BYX5pvH1jXzlODF5SIVW8TLW3floe34UxzKjbQ9u3+tcorLghAEfr2Ooarlfzd QDxzE7vOHOPRBLN1GHtXmfqBV8MQBk5iOw2cfoBDJQbeYqRdyLJEeDsPnAGu4J8S5APO sXd0ZiqeurYKNoR/gHS1hiFuGrouClnXBh9Mb2/1E4elT+niexy9lIqjRsFLPWl21/RB YlmFyoRo+V/6J3MXG2jcSj0muxolQdOeDRezzUYY3FrjH3EOtPgrtgh2YPSoro1WeuAJ CY1bxMkiHXH4D7gXgXJBwCVznZILqaozBXhih7lYr0hhteD6WdP4isXrcssoIeG85jSm 1j3w== Received: by 10.236.189.38 with SMTP id b26mr572934yhn.85.1347485249846; Wed, 12 Sep 2012 14:27:29 -0700 (PDT) Received: from localhost.localdomain ([201.52.229.219]) by mx.google.com with ESMTPS id s17sm19010523anj.13.2012.09.12.14.27.26 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Sep 2012 14:27:28 -0700 (PDT) From: Alexandre Pereira da Silva To: Dmitry Torokhov , Alexandre Pereira da Silva , JJ Ding , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] input: gpio_keys_polled: fix dt pdata->nbuttons Date: Wed, 12 Sep 2012 18:27:23 -0300 Message-Id: <1347485243-21173-1-git-send-email-aletes.xgr@gmail.com> X-Mailer: git-send-email 1.7.10 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org pdata->nbuttons should be updated by the dt code. Signed-off-by: Alexandre Pereira da Silva --- drivers/input/keyboard/gpio_keys_polled.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c index 7908952..f2142de 100644 --- a/drivers/input/keyboard/gpio_keys_polled.c +++ b/drivers/input/keyboard/gpio_keys_polled.c @@ -129,6 +129,7 @@ gpio_keys_polled_get_devtree_pdata(struct device *dev) } pdata->buttons = (struct gpio_keys_button *)(pdata + 1); + pdata->nbuttons = nbuttons; pdata->rep = !!of_get_property(node, "autorepeat", NULL); of_property_read_u32(node, "poll-interval", &pdata->poll_interval);