git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...
[pandora-kernel.git]
/
arch
/
arm
/
common
/
locomo.c
diff --git
a/arch/arm/common/locomo.c
b/arch/arm/common/locomo.c
index
d973c98
..
c3c3a33
100644
(file)
--- 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;
}
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.
/*
* 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->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;
dev->devid = info->devid;
dev->dev.parent = lchip->dev;
dev->dev.bus = &locomo_bus_type;