summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2006-03-19 07:53:46 +0000
committerDave Airlie <airlied@linux.ie>2006-03-19 07:53:46 +0000
commit6bb92ab086c7e21fe90b835f20e6ba493e988cf6 (patch)
treeabc8bdc1d0225e8a315df22ac011ebe23aedb328
parent8c8f937b3de12185e3c0041726a9f6fd5f3d21ff (diff)
fix issue in mga from kernel
-rw-r--r--linux-core/mga_drv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/mga_drv.c b/linux-core/mga_drv.c
index 43ba18cb..3a1e4b25 100644
--- a/linux-core/mga_drv.c
+++ b/linux-core/mga_drv.c
@@ -127,7 +127,7 @@ MODULE_LICENSE("GPL and additional rights");
* \returns
* If the device is a PCI G450, zero is returned. Otherwise 2 is returned.
*/
-int mga_driver_device_is_agp(drm_device_t * dev)
+static int mga_driver_device_is_agp(drm_device_t * dev)
{
const struct pci_dev * const pdev = dev->pdev;
@@ -141,7 +141,7 @@ int mga_driver_device_is_agp(drm_device_t * dev)
* device.
*/
- if ( (pdev->device == 0x0525)
+ if ((pdev->device == 0x0525) && pdev->bus->self
&& (pdev->bus->self->vendor == 0x3388)
&& (pdev->bus->self->device == 0x0021) ) {
return 0;