---

yaml --- r: 38135 b: refs/heads/master c: 5df0a29 h: refs/heads/master i: 38133: 5f3005c 38131: cbdf08f 38127: 3f9b90b v: v3
git-mirror · Oct 3, 2006 · a60cb77 · a60cb77
1 parent 5dd9bea
commit a60cb77
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2b9ecc41654256ae8829193d3380935833ae976
+refs/heads/master: 5df0a29d9c2239c28b5864037b51ac3d747439a9
diff --git a/trunk/drivers/char/tipar.c b/trunk/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;
 		}