Merge tag 'dt-for-3.6' of git://sources.calxeda.com/kernel/linux
Pull devicetree updates from Rob Herring: "A small set of changes for devicetree: - Couple of Documentation fixes - Addition of new helper function of_node_full_name - Improve of_parse_phandle_with_args return values - Some NULL related sparse fixes" Grant's busy packing. * tag 'dt-for-3.6' of git://sources.calxeda.com/kernel/linux: of: mtd: nuke useless const qualifier devicetree: add helper inline for retrieving a node's full name of: return -ENOENT when no property usage-model.txt: fix typo machine_init->init_machine of: Fix null pointer related warnings in base.c file LED: Fix missing semicolon in OF documentation of: fix a few typos in the binding documentation
This commit is contained in:
@@ -551,8 +551,7 @@ static struct iommu_table *cell_get_iommu_table(struct device *dev)
|
||||
iommu = cell_iommu_for_node(dev_to_node(dev));
|
||||
if (iommu == NULL || list_empty(&iommu->windows)) {
|
||||
printk(KERN_ERR "iommu: missing iommu for %s (node %d)\n",
|
||||
dev->of_node ? dev->of_node->full_name : "?",
|
||||
dev_to_node(dev));
|
||||
of_node_full_name(dev->of_node), dev_to_node(dev));
|
||||
return NULL;
|
||||
}
|
||||
window = list_entry(iommu->windows.next, struct iommu_window, list);
|
||||
|
Reference in New Issue
Block a user