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
/
on26.c
diff --git
a/drivers/block/paride/on26.c
b/drivers/block/paride/on26.c
index
9f837d9
..
95ba256
100644
(file)
--- a/
drivers/block/paride/on26.c
+++ b/
drivers/block/paride/on26.c
@@
-66,7
+66,7
@@
static int on26_read_regr( PIA *pi, int cont, int regr )
case 3:
case 4: w3(1); w3(1); w2(5); w4(r); w2(4);
w3(0); w3(0); w2(0x24); a = r4(); w2(4);
case 3:
case 4: w3(1); w3(1); w2(5); w4(r); w2(4);
w3(0); w3(0); w2(0x24); a = r4(); w2(4);
- w2(0x24); r4(); w2(4);
+ w2(0x24);
(void)
r4(); w2(4);
return a;
}
return a;
}
@@
-306,12
+306,12
@@
static struct pi_protocol on26 = {
static int __init on26_init(void)
{
static int __init on26_init(void)
{
- return p
i_register(&on26)-1
;
+ return p
aride_register(&on26)
;
}
static void __exit on26_exit(void)
{
}
static void __exit on26_exit(void)
{
- p
i
_unregister(&on26);
+ p
aride
_unregister(&on26);
}
MODULE_LICENSE("GPL");
}
MODULE_LICENSE("GPL");