diff options
Diffstat (limited to 'drivers/video/matrox/matroxfb_base.c')
-rw-r--r-- | drivers/video/matrox/matroxfb_base.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index c8559a756b75..886e475f22f2 100644 --- a/drivers/video/matrox/matroxfb_base.c +++ b/drivers/video/matrox/matroxfb_base.c | |||
@@ -1994,7 +1994,6 @@ static void matroxfb_unregister_device(struct matrox_fb_info* minfo) { | |||
1994 | 1994 | ||
1995 | static int matroxfb_probe(struct pci_dev* pdev, const struct pci_device_id* dummy) { | 1995 | static int matroxfb_probe(struct pci_dev* pdev, const struct pci_device_id* dummy) { |
1996 | struct board* b; | 1996 | struct board* b; |
1997 | u_int8_t rev; | ||
1998 | u_int16_t svid; | 1997 | u_int16_t svid; |
1999 | u_int16_t sid; | 1998 | u_int16_t sid; |
2000 | struct matrox_fb_info* minfo; | 1999 | struct matrox_fb_info* minfo; |
@@ -2005,11 +2004,10 @@ static int matroxfb_probe(struct pci_dev* pdev, const struct pci_device_id* dumm | |||
2005 | #endif | 2004 | #endif |
2006 | DBG(__FUNCTION__) | 2005 | DBG(__FUNCTION__) |
2007 | 2006 | ||
2008 | pci_read_config_byte(pdev, PCI_REVISION_ID, &rev); | ||
2009 | svid = pdev->subsystem_vendor; | 2007 | svid = pdev->subsystem_vendor; |
2010 | sid = pdev->subsystem_device; | 2008 | sid = pdev->subsystem_device; |
2011 | for (b = dev_list; b->vendor; b++) { | 2009 | for (b = dev_list; b->vendor; b++) { |
2012 | if ((b->vendor != pdev->vendor) || (b->device != pdev->device) || (b->rev < rev)) continue; | 2010 | if ((b->vendor != pdev->vendor) || (b->device != pdev->device) || (b->rev < pdev->revision)) continue; |
2013 | if (b->svid) | 2011 | if (b->svid) |
2014 | if ((b->svid != svid) || (b->sid != sid)) continue; | 2012 | if ((b->svid != svid) || (b->sid != sid)) continue; |
2015 | break; | 2013 | break; |