Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

[pandora-kernel.git] / drivers / media / dvb / mantis / mantis_pci.c

diff --git a/drivers/media/dvb/mantis/mantis_pci.c b/drivers/media/dvb/mantis/mantis_pci.c
index 10a432a..371558a 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_pci.c
+++ b/drivers/media/dvb/mantis/mantis_pci.c
@@ -48,7 +48,7 @@
 
 int __devinit mantis_pci_init(struct mantis_pci *mantis)
 {
-       u8 revision, latency;
+       u8 latency;
        struct mantis_hwconfig *config  = mantis->hwconfig;
        struct pci_dev *pdev            = mantis->pdev;
        int err, ret = 0;
@@ -95,9 +95,8 @@ int __devinit mantis_pci_init(struct mantis_pci *mantis)
        }
 
        pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &latency);
-       pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
        mantis->latency = latency;
-       mantis->revision = revision;
+       mantis->revision = pdev->revision;
 
        dprintk(MANTIS_ERROR, 0, "    Mantis Rev %d [%04x:%04x], ",
                mantis->revision,