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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
block
/
paride
/
kbic.c
diff --git
a/drivers/block/paride/kbic.c
b/drivers/block/paride/kbic.c
index
d983bce
..
35999c4
100644
(file)
--- a/
drivers/block/paride/kbic.c
+++ b/
drivers/block/paride/kbic.c
@@
-283,13
+283,21
@@
static struct pi_protocol k971 = {
static int __init kbic_init(void)
{
static int __init kbic_init(void)
{
- return (pi_register(&k951)||pi_register(&k971))-1;
+ int rv;
+
+ rv = paride_register(&k951);
+ if (rv < 0)
+ return rv;
+ rv = paride_register(&k971);
+ if (rv < 0)
+ paride_unregister(&k951);
+ return rv;
}
static void __exit kbic_exit(void)
{
}
static void __exit kbic_exit(void)
{
- p
i
_unregister(&k951);
- p
i
_unregister(&k971);
+ p
aride
_unregister(&k951);
+ p
aride
_unregister(&k971);
}
MODULE_LICENSE("GPL");
}
MODULE_LICENSE("GPL");