Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 26683
b: refs/heads/master
c: 4cfbd7e
h: refs/heads/master
i:
  26681: af7c563
  26679: 7cc5944
v: v3
  • Loading branch information
Martin Habets authored and David S. Miller committed May 8, 2006
1 parent 8cf5a92 commit 4fc4652
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bb3426ad6659282d9244d4909e69aa639d0360d0
refs/heads/master: 4cfbd7eb24975e942c3b6c0119c953c3a7a5f787
5 changes: 5 additions & 0 deletions trunk/arch/sparc/kernel/ioport.c
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,11 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp)
if (mmu_map_dma_area(dma_addrp, va, res->start, len_total) != 0)
goto err_noiommu;

/* Set the resource name, if known. */
if (sdev) {
res->name = sdev->prom_name;
}

return (void *)res->start;

err_noiommu:
Expand Down

0 comments on commit 4fc4652

Please sign in to comment.