Skip to content

Commit

Permalink
Revert "swiotlb: fix wrong panic"
Browse files Browse the repository at this point in the history
This reverts commit 484d82b.

It caused build problems on some architectures and was already asked to
be removed from the queue.  It was my fault for incorrectly applying it.

Reported-by: Shawn Bohrer <shawn.bohrer@gmail.co
Reported-by: Stefan Bader <stefan.bader@canonical.com>
Reported-by: David Engel <david@istwok.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed Mar 3, 2011
1 parent 96b0398 commit ba5c312
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions lib/swiotlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -631,10 +631,8 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
/*
* Ensure that the address returned is DMA'ble
*/
if (!dma_capable(dev, dev_addr, size)) {
swiotlb_tbl_unmap_single(dev, map, size, dir);
dev_addr = swiotlb_virt_to_bus(dev, io_tlb_overflow_buffer);
}
if (!dma_capable(dev, dev_addr, size))
panic("map_single: bounce buffer is not DMA'ble");

return dev_addr;
}
Expand Down

0 comments on commit ba5c312

Please sign in to comment.