projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
drivers
/
atm
/
he.c
diff --git
a/drivers/atm/he.c
b/drivers/atm/he.c
index
801e8b6
..
6cf59bf
100644
(file)
--- a/
drivers/atm/he.c
+++ b/
drivers/atm/he.c
@@
-366,7
+366,7
@@
he_init_one(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent)
goto init_one_failure;
}
- atm_dev = atm_dev_register(DEV_LABEL, &he_ops, -1, NULL);
+ atm_dev = atm_dev_register(DEV_LABEL, &
pci_dev->dev, &
he_ops, -1, NULL);
if (!atm_dev) {
err = -ENODEV;
goto init_one_failure;