diff --git a/[refs] b/[refs]
index 28f69099acd4..51e87b05a862 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45f035ab9b8f45aaf1eb2213218b7e9c14af3fc2
+refs/heads/master: 1b8cb9290671a4c025c16a51d316031f9ec04976
diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c
index 3f8077ce585c..ddeca142293c 100644
--- a/trunk/drivers/base/platform.c
+++ b/trunk/drivers/base/platform.c
@@ -103,6 +103,9 @@ struct resource *platform_get_resource_byname(struct platform_device *dev,
 	for (i = 0; i < dev->num_resources; i++) {
 		struct resource *r = &dev->resource[i];
 
+		if (unlikely(!r->name))
+			continue;
+
 		if (type == resource_type(r) && !strcmp(r->name, name))
 			return r;
 	}