Commit 3a1f0a0e authored Apr 12, 2010 by Clemens Ladisch Committed by Stefan Richter Apr 19, 2010

firewire: core: fix retries calculation in iso manage_channel()



If there is a permanent error condition when communicating with the IRM,
after the sixth error, the retry variable will be decremented to -1.
If, in this case, the bits in channels_mask are not yet exhausted, the
next channel is retried 2^32 times.

To fix this, check that retry is never decremented beyond zero.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

parent a2612cb1

drivers/firewire/core-iso.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -250,10 +250,12 @@ static int manage_channel(struct fw_card *card, int irm_id, int generation,

		/* 1394-1995 IRM, fall through to retry. */
		default:
		if (retry--)
		if (retry) {
		retry--;
		i--;
		}
		}
		}

		return -EIO;
		}