diff options
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 7 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index 652fa8d5a..c137b8532 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,5 +1,5 @@ /* - $Id: bttv-driver.c,v 1.44 2005/07/15 21:44:14 mchehab Exp $ + $Id: bttv-driver.c,v 1.45 2005/07/20 19:43:24 mkrufky Exp $ bttv - Bt848 frame grabber driver @@ -3898,11 +3898,6 @@ static int __devinit bttv_probe(struct pci_dev *dev, pci_set_master(dev); pci_set_command(dev); pci_set_drvdata(dev,btv); - if (!pci_dma_supported(dev,0xffffffff)) { - printk("bttv%d: Oops: no 32bit PCI DMA ???\n", btv->c.nr); - result = -EIO; - goto fail1; - } pci_read_config_byte(dev, PCI_CLASS_REVISION, &btv->revision); pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat); diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 47852d987..edc7a00d8 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-07-20 07:40 mkrufky + * bttv-driver.c: + - pci_dma_supported() is called after pci_set_dma_mask() which + already did check that for us. The attached patch removes the + unneeded call to pci_dma_supported() + + Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch> + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-07-20 05:35 mkrufky * cx88-dvb.c: - Removed unnecessary comment. |