diff --git a/[refs] b/[refs]
index e0602f713e7b..361498f3676e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f3f7eceff47f9e320ca67b3e9f16fb295106514
+refs/heads/master: 3bb5534853dbb1e445a9b26ecab8ad331ff14a7e
diff --git a/trunk/drivers/usb/musb/musb_dsps.c b/trunk/drivers/usb/musb/musb_dsps.c
index 217808d9fbe1..dabe7b63654f 100644
--- a/trunk/drivers/usb/musb/musb_dsps.c
+++ b/trunk/drivers/usb/musb/musb_dsps.c
@@ -479,9 +479,9 @@ static int __devinit dsps_create_musb_pdev(struct dsps_glue *glue, u8 id)
 		ret = -ENODEV;
 		goto err0;
 	}
-	strcpy((u8 *)res->name, "mc");
 	res->parent = NULL;
 	resources[1] = *res;
+	resources[1].name = "mc";
 
 	/* allocate the child platform device */
 	musb = platform_device_alloc("musb-hdrc", -1);