* [PATCH] 2.5.59 : drivers/char/sx.c
@ 2003-02-07 17:21 Frank Davis
2003-02-10 0:30 ` Rusty Russell
0 siblings, 1 reply; 2+ messages in thread
From: Frank Davis @ 2003-02-07 17:21 UTC (permalink / raw)
To: linux-kernel; +Cc: fdavis, trivial
Hello all,
The following patch addresses buzilla bug # 322, and removes a double
logical issue. Please review for inclusion.
Regards,
Frank
--- linux/drivers/char/sx.c.old 2003-01-16 21:22:03.000000000 -0500
+++ linux/drivers/char/sx.c 2003-02-07 02:30:33.000000000 -0500
@@ -522,13 +522,13 @@
func_enter ();
- for (i=0; i < TIMEOUT_1 > 0;i++)
+ for (i=0; ((TIMEOUT_1 > 0) && (i < TIMEOUT_1));i++)
if ((read_sx_byte (board, offset) & mask) == correctval) {
func_exit ();
return 1;
}
- for (i=0; i < TIMEOUT_2 > 0;i++) {
+ for (i=0; ((TIMEOUT_2 > 0 ) && (i < TIMEOUT_2 > 0));i++) {
if ((read_sx_byte (board, offset) & mask) == correctval) {
func_exit ();
return 1;
@@ -548,13 +548,15 @@
func_enter ();
- for (i=0; i < TIMEOUT_1 > 0;i++)
+ for (i=0; ((TIMEOUT_1 > 0) && (i < TIMEOUT_1));i++)
+ if ((read_sx_byte (board, offset) & mask) == correctval) {
if ((read_sx_byte (board, offset) & mask) != badval) {
func_exit ();
return 1;
}
- for (i=0; i < TIMEOUT_2 > 0;i++) {
+ for (i=0; ((TIMEOUT_2 > 0 ) && (i < TIMEOUT_2 > 0));i++) {
+ if ((read_sx_byte (board, offset) & mask) == correctval) {
if ((read_sx_byte (board, offset) & mask) != badval) {
func_exit ();
return 1;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] 2.5.59 : drivers/char/sx.c
2003-02-07 17:21 [PATCH] 2.5.59 : drivers/char/sx.c Frank Davis
@ 2003-02-10 0:30 ` Rusty Russell
0 siblings, 0 replies; 2+ messages in thread
From: Rusty Russell @ 2003-02-10 0:30 UTC (permalink / raw)
To: Frank Davis; +Cc: R.E.Wolff, linux-kernel
In message <Pine.LNX.4.44.0302071219540.6917-100000@master> you write:
> Hello all,
> The following patch addresses buzilla bug # 322, and removes a double
> logical issue. Please review for inclusion.
>
> Regards,
> Frank
Roger? Is this what was meant here?
Thanks,
Rusty.
> --- linux/drivers/char/sx.c.old 2003-01-16 21:22:03.000000000 -0500
> +++ linux/drivers/char/sx.c 2003-02-07 02:30:33.000000000 -0500
> @@ -522,13 +522,13 @@
>
> func_enter ();
>
> - for (i=0; i < TIMEOUT_1 > 0;i++)
> + for (i=0; ((TIMEOUT_1 > 0) && (i < TIMEOUT_1));i++)
> if ((read_sx_byte (board, offset) & mask) == correctval) {
> func_exit ();
> return 1;
> }
>
> - for (i=0; i < TIMEOUT_2 > 0;i++) {
> + for (i=0; ((TIMEOUT_2 > 0 ) && (i < TIMEOUT_2 > 0));i++) {
> if ((read_sx_byte (board, offset) & mask) == correctval) {
> func_exit ();
> return 1;
> @@ -548,13 +548,15 @@
>
> func_enter ();
>
> - for (i=0; i < TIMEOUT_1 > 0;i++)
> + for (i=0; ((TIMEOUT_1 > 0) && (i < TIMEOUT_1));i++)
> + if ((read_sx_byte (board, offset) & mask) == correctval) {
> if ((read_sx_byte (board, offset) & mask) != badval) {
> func_exit ();
> return 1;
> }
>
> - for (i=0; i < TIMEOUT_2 > 0;i++) {
> + for (i=0; ((TIMEOUT_2 > 0 ) && (i < TIMEOUT_2 > 0));i++) {
> + if ((read_sx_byte (board, offset) & mask) == correctval) {
> if ((read_sx_byte (board, offset) & mask) != badval) {
> func_exit ();
> return 1;
>
--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2003-02-10 1:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-02-07 17:21 [PATCH] 2.5.59 : drivers/char/sx.c Frank Davis
2003-02-10 0:30 ` Rusty Russell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).