summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorZach Brown <zach.brown@oracle.com>2006-10-03 01:16:08 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 08:04:19 -0700
commit5df0a29d9c2239c28b5864037b51ac3d747439a9 (patch)
treeefcba93e20da8e8fa5a536653ca792dff50fe6a8 /drivers
parentf2b9ecc41654256ae8829193d3380935833ae976 (diff)
downloadop-kernel-dev-5df0a29d9c2239c28b5864037b51ac3d747439a9.zip
op-kernel-dev-5df0a29d9c2239c28b5864037b51ac3d747439a9.tar.gz
[PATCH] pr_debug: tipar: repair nonexistant pr_debug argument use
tipar: repair nonexistant pr_debug argument use I guessed what the pr_debug meant by 'data'. Signed-off-by: Zach Brown <zach.brown@oracle.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/tipar.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c
index d30dc09..9df0ca1 100644
--- 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;
}
OpenPOWER on IntegriCloud