X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Farm%2Fcommon%2Flocomo.c;h=c3c3a333904995273e5f7af7c68890c8baee361d;hb=3f9787046ea37a26170dc4439efa21f8d23a9978;hp=d973c986f721aec8822f8ef0db8eeb97b0ec199e;hpb=2222c313e9371b6476787594bc5804c72cee2597;p=linux-2.6-omap-h63xx.git

diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index d973c986f72..c3c3a333904 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -543,7 +543,6 @@ locomo_init_one_child(struct locomo *lchip, struct locomo_dev_info *info)
 		goto out;
 	}
 
-	strncpy(dev->dev.bus_id, info->name, sizeof(dev->dev.bus_id));
 	/*
 	 * If the parent device has a DMA mask associated with it,
 	 * propagate it down to the children.
@@ -553,6 +552,7 @@ locomo_init_one_child(struct locomo *lchip, struct locomo_dev_info *info)
 		dev->dev.dma_mask = &dev->dma_mask;
 	}
 
+	dev_set_name(&dev->dev, "%s", info->name);
 	dev->devid	 = info->devid;
 	dev->dev.parent  = lchip->dev;
 	dev->dev.bus     = &locomo_bus_type;