diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 18:51:06 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 18:51:06 -0500 |
| commit | 0811a433c61e85f895018239c4466a36311cd5de (patch) | |
| tree | 276933e518e5525d24ae37b02df2db9909679260 /lib/swiotlb.c | |
| parent | c299030765292434b73572f9bcfe84951ff06614 (diff) | |
| parent | 3d14bdad40315b54470cb7812293d14c8af2bf7d (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'lib/swiotlb.c')
| -rw-r--r-- | lib/swiotlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index ec7922bd0d61..30fe65ede2bb 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c | |||
| @@ -619,7 +619,7 @@ swiotlb_full(struct device *dev, size_t size, int dir, int do_panic) | |||
| 619 | * the damage, or panic when the transfer is too big. | 619 | * the damage, or panic when the transfer is too big. |
| 620 | */ | 620 | */ |
| 621 | printk(KERN_ERR "DMA: Out of SW-IOMMU space for %zu bytes at " | 621 | printk(KERN_ERR "DMA: Out of SW-IOMMU space for %zu bytes at " |
| 622 | "device %s\n", size, dev ? dev->bus_id : "?"); | 622 | "device %s\n", size, dev ? dev_name(dev) : "?"); |
| 623 | 623 | ||
| 624 | if (size > io_tlb_overflow && do_panic) { | 624 | if (size > io_tlb_overflow && do_panic) { |
| 625 | if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL) | 625 | if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL) |