diff options
| author | Jon Smirl <jonsmirl@yahoo.com> | 2004-08-28 23:59:51 +0000 |
|---|---|---|
| committer | Jon Smirl <jonsmirl@yahoo.com> | 2004-08-28 23:59:51 +0000 |
| commit | 4a89c75456b1d7d0dd20bae0e0f5dd47bdc5417e (patch) | |
| tree | 8181c948c5874dce4d595492ba251dc400b5a4af | |
| parent | 73e606753fcece20f905281d44067504d5f2fabc (diff) | |
Initialize pdev to NULL correctly so that pci_get_subsys() will work.
| -rw-r--r-- | linux-core/drm_drv.c | 4 | ||||
| -rw-r--r-- | linux/drm_drv.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c index 523d1140..1a5a4696 100644 --- a/linux-core/drm_drv.c +++ b/linux-core/drm_drv.c @@ -601,7 +601,7 @@ static struct pci_driver drm_driver = { */ static int __init drm_init( void ) { - struct pci_dev *pdev = NULL; + struct pci_dev *pdev; struct pci_device_id *pid; int i; @@ -616,6 +616,7 @@ static int __init drm_init( void ) for (i=0; (DRM(pciidlist)[i].vendor != 0) && !DRM(fb_loaded); i++) { pid = &DRM(pciidlist[i]); + pdev = NULL; /* pass back in pdev to account for multiple identical cards */ while ((pdev = pci_get_subsys(pid->vendor, pid->device, pid->subvendor, pid->subdevice, pdev))) { /* is there already a driver loaded, or (short circuit saves work) */ @@ -638,6 +639,7 @@ static int __init drm_init( void ) for (i=0; DRM(pciidlist)[i].vendor != 0; i++) { pid = &DRM(pciidlist[i]); + pdev = NULL; /* pass back in pdev to account for multiple identical cards */ while ((pdev = pci_get_subsys(pid->vendor, pid->device, pid->subvendor, pid->subdevice, pdev))) { /* stealth mode requires a manual probe */ diff --git a/linux/drm_drv.h b/linux/drm_drv.h index 523d1140..1a5a4696 100644 --- a/linux/drm_drv.h +++ b/linux/drm_drv.h @@ -601,7 +601,7 @@ static struct pci_driver drm_driver = { */ static int __init drm_init( void ) { - struct pci_dev *pdev = NULL; + struct pci_dev *pdev; struct pci_device_id *pid; int i; @@ -616,6 +616,7 @@ static int __init drm_init( void ) for (i=0; (DRM(pciidlist)[i].vendor != 0) && !DRM(fb_loaded); i++) { pid = &DRM(pciidlist[i]); + pdev = NULL; /* pass back in pdev to account for multiple identical cards */ while ((pdev = pci_get_subsys(pid->vendor, pid->device, pid->subvendor, pid->subdevice, pdev))) { /* is there already a driver loaded, or (short circuit saves work) */ @@ -638,6 +639,7 @@ static int __init drm_init( void ) for (i=0; DRM(pciidlist)[i].vendor != 0; i++) { pid = &DRM(pciidlist[i]); + pdev = NULL; /* pass back in pdev to account for multiple identical cards */ while ((pdev = pci_get_subsys(pid->vendor, pid->device, pid->subvendor, pid->subdevice, pdev))) { /* stealth mode requires a manual probe */ |