git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/misc' into topic/misc
[pandora-kernel.git]
/
drivers
/
net
/
via-velocity.c
diff --git
a/drivers/net/via-velocity.c
b/drivers/net/via-velocity.c
index
42dffd3
..
fd69095
100644
(file)
--- a/
drivers/net/via-velocity.c
+++ b/
drivers/net/via-velocity.c
@@
-2763,12
+2763,12
@@
static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
vptr->dev = dev;
- dev->irq = pdev->irq;
-
ret = pci_enable_device(pdev);
if (ret < 0)
goto err_free_dev;
+ dev->irq = pdev->irq;
+
ret = velocity_get_pci_info(vptr, pdev);
if (ret < 0) {
/* error message already printed */