From c488a5c500488f12d1f97080588e8ae74ba0cf39 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Tue, 21 Aug 2012 22:04:46 -0700 Subject: [PATCH] --- yaml --- r: 328521 b: refs/heads/master c: 31b95bfb79e8d7637ba0d399eb152f9b0d548340 h: refs/heads/master i: 328519: c4e229a1379948475daf18aac374cf81ec75b1c7 v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/samsung-keypad.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 97cd3716f154..f58b1648b547 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4d4661bee0f54410ac65571b50df5d9fe091d03 +refs/heads/master: 31b95bfb79e8d7637ba0d399eb152f9b0d548340 diff --git a/trunk/drivers/input/keyboard/samsung-keypad.c b/trunk/drivers/input/keyboard/samsung-keypad.c index e2f31c8489f5..277e26dc910e 100644 --- a/trunk/drivers/input/keyboard/samsung-keypad.c +++ b/trunk/drivers/input/keyboard/samsung-keypad.c @@ -256,7 +256,7 @@ static struct samsung_keypad_platdata *samsung_keypad_parse_dt( struct matrix_keymap_data *keymap_data; uint32_t *keymap, num_rows = 0, num_cols = 0; struct device_node *np = dev->of_node, *key_np; - unsigned int key_count = 0; + unsigned int key_count; pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) { @@ -280,9 +280,7 @@ static struct samsung_keypad_platdata *samsung_keypad_parse_dt( } pdata->keymap_data = keymap_data; - for_each_child_of_node(np, key_np) - key_count++; - + key_count = of_get_child_count(np); keymap_data->keymap_size = key_count; keymap = devm_kzalloc(dev, sizeof(uint32_t) * key_count, GFP_KERNEL); if (!keymap) {