From patchwork Sun Aug 30 09:18:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 44744 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7U9J9ol022807 for ; Sun, 30 Aug 2009 09:19:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752290AbZH3JSO (ORCPT ); Sun, 30 Aug 2009 05:18:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752870AbZH3JSO (ORCPT ); Sun, 30 Aug 2009 05:18:14 -0400 Received: from mgw2.diku.dk ([130.225.96.92]:42894 "EHLO mgw2.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751554AbZH3JSN (ORCPT ); Sun, 30 Aug 2009 05:18:13 -0400 Received: from localhost (localhost [127.0.0.1]) by mgw2.diku.dk (Postfix) with ESMTP id D17AA19BB87; Sun, 30 Aug 2009 11:18:14 +0200 (CEST) Received: from mgw2.diku.dk ([127.0.0.1]) by localhost (mgw2.diku.dk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 10217-19; Sun, 30 Aug 2009 11:18:13 +0200 (CEST) Received: from nhugin.diku.dk (nhugin.diku.dk [130.225.96.140]) by mgw2.diku.dk (Postfix) with ESMTP id 959A319BB69; Sun, 30 Aug 2009 11:18:13 +0200 (CEST) Received: from ask.diku.dk (ask.diku.dk [130.225.96.225]) by nhugin.diku.dk (Postfix) with ESMTP id 8A7F86DF823; Sun, 30 Aug 2009 11:16:43 +0200 (CEST) Received: by ask.diku.dk (Postfix, from userid 3767) id 79F0FF07B; Sun, 30 Aug 2009 11:18:13 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by ask.diku.dk (Postfix) with ESMTP id 74DCCF01B; Sun, 30 Aug 2009 11:18:13 +0200 (CEST) Date: Sun, 30 Aug 2009 11:18:13 +0200 (CEST) From: Julia Lawall To: Dmitry Torokhov , Dmitry Torokhov , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] drivers/input/keyboard: Move a dereference below a NULL test Message-ID: MIME-Version: 1.0 X-Virus-Scanned: amavisd-new at diku.dk Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Julia Lawall If the NULL test is necessary, then the dereference should be moved below the NULL test. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/). // @@ type T; expression E; identifier i,fld; statement S; @@ - T i = E->fld; + T i; ... when != E when != i if (E == NULL) S + i = E->fld; // Signed-off-by: Julia Lawall --- drivers/input/keyboard/w90p910_keypad.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -u -p a/drivers/input/keyboard/w90p910_keypad.c b/drivers/input/keyboard/w90p910_keypad.c --- a/drivers/input/keyboard/w90p910_keypad.c +++ b/drivers/input/keyboard/w90p910_keypad.c @@ -120,7 +120,7 @@ static int __devinit w90p910_keypad_prob { const struct w90p910_keypad_platform_data *pdata = pdev->dev.platform_data; - const struct matrix_keymap_data *keymap_data = pdata->keymap_data; + const struct matrix_keymap_data *keymap_data; struct w90p910_keypad *keypad; struct input_dev *input_dev; struct resource *res; @@ -132,6 +132,7 @@ static int __devinit w90p910_keypad_prob dev_err(&pdev->dev, "no platform data defined\n"); return -EINVAL; } + keymap_data = pdata->keymap_data; irq = platform_get_irq(pdev, 0); if (irq < 0) {