diff --git a/drivers/of/base.c b/drivers/of/base.c
index b299de2b3afad1eb8a9832cf0fe74f2918797013..64018ebcc8618a967f7af26461e21b5e8075ce56 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1777,6 +1777,9 @@ int of_remove_property(struct device_node *np, struct property *prop)
 	unsigned long flags;
 	int rc;
 
+	if (!prop)
+		return -ENODEV;
+
 	mutex_lock(&of_mutex);
 
 	raw_spin_lock_irqsave(&devtree_lock, flags);