diff --git a/[refs] b/[refs] index f196e5e3855f..76f13d64c532 100644 --- 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 index d30dc09dbbc9..9df0ca1be0e3 100644 --- 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; }