git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
char
/
agp
/
efficeon-agp.c
diff --git
a/drivers/char/agp/efficeon-agp.c
b/drivers/char/agp/efficeon-agp.c
index
6944d17
..
3346da4
100644
(file)
--- a/
drivers/char/agp/efficeon-agp.c
+++ b/
drivers/char/agp/efficeon-agp.c
@@
-375,7
+375,7
@@
static int __devinit agp_efficeon_probe(struct pci_dev *pdev,
if (!r->start && r->end) {
if(pci_assign_resource(pdev, 0)) {
printk(KERN_ERR PFX "could not assign resource 0\n");
if (!r->start && r->end) {
if(pci_assign_resource(pdev, 0)) {
printk(KERN_ERR PFX "could not assign resource 0\n");
- return
(-ENODEV)
;
+ return
-ENODEV
;
}
}
}
}
@@
-386,7
+386,7
@@
static int __devinit agp_efficeon_probe(struct pci_dev *pdev,
*/
if (pci_enable_device(pdev)) {
printk(KERN_ERR PFX "Unable to Enable PCI device\n");
*/
if (pci_enable_device(pdev)) {
printk(KERN_ERR PFX "Unable to Enable PCI device\n");
- return
(-ENODEV)
;
+ return
-ENODEV
;
}
/* Fill in the mode register */
}
/* Fill in the mode register */
@@
-441,6
+441,9
@@
static int __init agp_efficeon_init(void)
{
static int agp_initialised=0;
{
static int agp_initialised=0;
+ if (agp_off)
+ return -EINVAL;
+
if (agp_initialised == 1)
return 0;
agp_initialised=1;
if (agp_initialised == 1)
return 0;
agp_initialised=1;