diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/video-buf.c | 13 |
2 files changed, 12 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index f115d8564..91d4d9ce7 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.56 2005/02/15 10:51:54 kraxel Exp $ + * $Id: cx88-video.c,v 1.57 2005/02/24 13:32:30 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -1348,7 +1348,6 @@ static int video_do_ioctl(struct inode *inode, struct file *file, 0; if (UNSET != core->tuner_type) cap->capabilities |= V4L2_CAP_TUNER; - return 0; } diff --git a/linux/drivers/media/video/video-buf.c b/linux/drivers/media/video/video-buf.c index 58352a563..6684dbc54 100644 --- a/linux/drivers/media/video/video-buf.c +++ b/linux/drivers/media/video/video-buf.c @@ -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. @@ -222,9 +222,18 @@ int videobuf_dma_pci_map(struct pci_dev *dev, struct videobuf_dmabuf *dma) 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; } |