projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f2b9ecc
)
[PATCH] pr_debug: tipar: repair nonexistant pr_debug argument use
author
Zach Brown
<
[email protected]
>
Tue, 3 Oct 2006 08:16:08 +0000
(
01:16
-0700)
committer
Linus Torvalds
<
[email protected]
>
Tue, 3 Oct 2006 15:04:19 +0000
(08:04 -0700)
tipar: repair nonexistant pr_debug argument use
I guessed what the pr_debug meant by 'data'.
Signed-off-by: Zach Brown <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
drivers/char/tipar.c
patch
|
blob
|
history
diff --git
a/drivers/char/tipar.c
b/drivers/char/tipar.c
index d30dc09dbbc9df2ffbb5c09e8f3cb32e334a49e2..9df0ca1be0e31a4e25310e58b370c10da4227c78 100644
(file)
--- a/
drivers/char/tipar.c
+++ b/
drivers/char/tipar.c
@@
-224,14
+224,16
@@
probe_ti_parallel(int minor)
{
int i;
int seq[] = { 0x00, 0x20, 0x10, 0x30 };
+ int data;
for (i = 3; i >= 0; i--) {
outbyte(3, minor);
outbyte(i, minor);
udelay(delay);
+ data = inbyte(minor) & 0x30;
pr_debug("tipar: Probing -> %i: 0x%02x 0x%02x\n", i,
- data
& 0x30
, seq[i]);
- if (
(inbyte(minor) & 0x30)
!= seq[i]) {
+ data, seq[i]);
+ if (
data
!= seq[i]) {
outbyte(3, minor);
return -1;
}