Merge branch 'for-2.6.40' of git://linux-nfs.org/~bfields/linux

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / media / common / saa7146_core.c

diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index 9f47e383c57a5778bc39161c06d2c6631d317b46..9af2140b57a4c94c6b2571e7fb718747338ab62e 100644 (file)
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -378,12 +378,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
        dev->pci = pci;
 
        /* get chip-revision; this is needed to enable bug-fixes */
-       err = pci_read_config_dword(pci, PCI_CLASS_REVISION, &dev->revision);
-       if (err < 0) {
-               ERR(("pci_read_config_dword() failed.\n"));
-               goto err_disable;
-       }
-       dev->revision &= 0xf;
+       dev->revision = pci->revision;
 
        /* remap the memory from virtual to physical address */