git://git.onelab.eu
/
nozomi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
patch for 2.6.22 - sent by Roberto
[nozomi.git]
/
nozomi.c
diff --git
a/nozomi.c
b/nozomi.c
index
af41bb9
..
1f67781
100644
(file)
--- a/
nozomi.c
+++ b/
nozomi.c
@@
-1733,7
+1733,8
@@
static int __devinit nozomi_card_init(struct pci_dev *pdev,
BUG_ON(!dc->tty_flip_wq);
return -ENOMEM;
}
BUG_ON(!dc->tty_flip_wq);
return -ENOMEM;
}
- INIT_WORK(&dc->tty_flip_wq_struct, tty_flip_queue_function, dc);
+// INIT_WORK(&dc->tty_flip_wq_struct, tty_flip_queue_function, dc);
+ INIT_WORK(&dc->tty_flip_wq_struct, tty_flip_queue_function);
#endif
spin_lock_init(&dc->spin_mutex);
make_proc_dirs();
#endif
spin_lock_init(&dc->spin_mutex);
make_proc_dirs();
@@
-2393,7
+2394,8
@@
static __init int nozomi_init(void)
{
int rval = 0;
{
int rval = 0;
- rval = pci_module_init(&nozomi_driver);
+// rval = pci_module_init(&nozomi_driver);
+ rval = pci_register_driver(&nozomi_driver);
printk(KERN_INFO "Initializing %s\n", VERSION_STRING);
return rval;
}
printk(KERN_INFO "Initializing %s\n", VERSION_STRING);
return rval;
}