2 files changed, 3 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index e8552782b440..874921e97802 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -33,6 +33,7 @@ qcom	Qualcomm, Inc.
 ramtron Ramtron International
 samsung Samsung Semiconductor
 schindler       Schindler
+sil     Silicon Image
 simtek
 sirf    SiRF Technology, Inc.
 stericsson      ST-Ericsson
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 791270b8bd1c..19c0115092dd 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -424,6 +424,8 @@ void __init of_irq_init(const struct of_device_id *matches)
 
                 desc->dev = np;
                 desc->interrupt_parent = of_irq_find_parent(np);
+                if (desc->interrupt_parent == np)
+                        desc->interrupt_parent = NULL;
                 list_add_tail(&desc->list, &intc_desc_list);
         }