summary refs log tree commit diff
path: root/drivers/of
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-06-23 15:50:07 +0800
committerGrant Likely <grant.likely@linaro.org>2013-07-22 19:40:38 +0100
commitc0cdfaa0a5e7a346ac2f661f63f543cdc5f7cbbe (patch)
treea50fe3d27f2bcb9aa00e2c2b6e6c428e1c86618c /drivers/of
parentcfd1ee3e37360ac6ec8c737e63e70c5d583f1e51 (diff)
downloadlinux-c0cdfaa0a5e7a346ac2f661f63f543cdc5f7cbbe.tar.gz
of/irq: Avoid calling list_first_entry() for empty list
list_first_entry() expects the list is not empty, we need to check if list is
empty before calling list_first_entry(). Thus use list_first_entry_or_null()
instead of list_first_entry().

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/irq.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index a3c1c5aae6a9..5c645c7227b8 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -482,8 +482,9 @@ void __init of_irq_init(const struct of_device_id *matches)
 		}
 
 		/* Get the next pending parent that might have children */
-		desc = list_first_entry(&intc_parent_list, typeof(*desc), list);
-		if (list_empty(&intc_parent_list) || !desc) {
+		desc = list_first_entry_or_null(&intc_parent_list,
+						typeof(*desc), list);
+		if (!desc) {
 			pr_err("of_irq_init: children remain, but no parents\n");
 			break;
 		}