From: Gerd Knorr <kraxel@bytesex.org>
Bugfix: catch pci_map_sg() failures.
Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/media/video/video-buf.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff -puN drivers/media/video/video-buf.c~v4l-video-buf-update drivers/media/video/video-buf.c
--- 25/drivers/media/video/video-buf.c~v4l-video-buf-update 2005-03-11 12:32:17.000000000 -0800
+++ 25-akpm/drivers/media/video/video-buf.c 2005-03-11 12:32:17.000000000 -0800
@@ -1,5 +1,5 @@
/*
- * $Id: video-buf.c,v 1.17 2004/12/10 12:33:40 kraxel Exp $
+ * $Id: video-buf.c,v 1.18 2005/02/24 13:32:30 kraxel Exp $
*
* generic helper functions for video4linux capture buffers, to handle
* memory management and PCI DMA. Right now bttv + saa7134 use it.
@@ -217,9 +217,18 @@ int videobuf_dma_pci_map(struct pci_dev
return -ENOMEM;
}
- if (!dma->bus_addr)
+ if (!dma->bus_addr) {
dma->sglen = pci_map_sg(dev,dma->sglist,dma->nr_pages,
dma->direction);
+ if (0 == dma->sglen) {
+ printk(KERN_WARNING
+ "%s: pci_map_sg failed\n",__FUNCTION__);
+ kfree(dma->sglist);
+ dma->sglist = NULL;
+ dma->sglen = 0;
+ return -EIO;
+ }
+ }
return 0;
}
_