[Linux1394-cvslog] rev 837 - branches/linux-2.4

[SVN U. <dm...@li...>]

Author: dmaas
Date: 2003-03-14 01:38:45 -0500 (Fri, 14 Mar 2003)
New Revision: 837

Modified:
   branches/linux-2.4/ohci1394.c
Log:
ohci1394 rawiso:
fix calculation of block_irq_interval

Thanks to Alberto Perez and Steve Kinneberg.


Modified: branches/linux-2.4/ohci1394.c
==============================================================================
--- branches/linux-2.4/ohci1394.c	(original)
+++ branches/linux-2.4/ohci1394.c	2003-03-14 01:38:46.000000000 -0500
@@ -1207,10 +1207,11 @@
 		/* iso->irq_interval is in packets - translate that to blocks */
 		/* (err, sort of... 1 is always the safest value) */
 		recv->block_irq_interval = iso->irq_interval / recv->nblocks;
+		if(recv->block_irq_interval*4 > recv->nblocks)
+			recv->block_irq_interval = recv->nblocks/4;
 		if(recv->block_irq_interval < 1)
 			recv->block_irq_interval = 1;
-		else if(recv->block_irq_interval*4 > recv->nblocks)
-			recv->block_irq_interval = recv->nblocks/4;
+
 	} else {
 		int max_packet_size;