X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fswiotlb.c;h=78330c37a61bd1682768a61148be00a9a083003a;hb=9a6558371bcd01c2973b7638181db4ccc34eab4f;hp=f8eebd489149e5c0cd7177ce98a5246bc25b32f3;hpb=a9b9e81c915e4a57ac3b21d1a7fa7ff184639780;p=linux-2.6-omap-h63xx.git

diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index f8eebd48914..78330c37a61 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -497,8 +497,10 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
 		printk("hwdev DMA mask = 0x%016Lx, dev_addr = 0x%016Lx\n",
 		       (unsigned long long)*hwdev->dma_mask,
 		       (unsigned long long)dev_addr);
-		panic("swiotlb_alloc_coherent: allocated memory is out of "
-		      "range for device");
+
+		/* DMA_TO_DEVICE to avoid memcpy in unmap_single */
+		unmap_single(hwdev, ret, size, DMA_TO_DEVICE);
+		return NULL;
 	}
 	*dma_handle = dev_addr;
 	return ret;