rpms/kernel/F-8 linux-2.6-firewire-ohci-1.0-iso-receive.patch, 1.2, 1.3

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2883

Modified Files:
	linux-2.6-firewire-ohci-1.0-iso-receive.patch 
Log Message:
Fix up minor patch fubar so things actually build...

linux-2.6-firewire-ohci-1.0-iso-receive.patch:

Index: linux-2.6-firewire-ohci-1.0-iso-receive.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-firewire-ohci-1.0-iso-receive.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-firewire-ohci-1.0-iso-receive.patch	30 Nov 2007 17:19:10 -0000	1.2
+++ linux-2.6-firewire-ohci-1.0-iso-receive.patch	30 Nov 2007 18:56:53 -0000	1.3
@@ -1,5 +1,5 @@
 --- linux-2.6.23.noarch/drivers/firewire/fw-ohci.c	2007-10-09 16:31:38.000000000 -0400
-+++ linux-2.6.23.noarch.fw/drivers/firewire/fw-ohci.c	2007-11-30 12:15:34.000000000 -0500
++++ linux-2.6.23.noarch.fw/drivers/firewire/fw-ohci.c	2007-11-30 13:56:02.000000000 -0500
 @@ -435,6 +435,16 @@ static void ar_context_run(struct ar_con
  	flush_writes(ctx->ohci);
  }
@@ -149,7 +149,7 @@
  	/* FIXME: make packet-per-buffer/dual-buffer a context option */
  	while (rest > 0) {
  		d = context_get_descriptors(&ctx->context,
-@@ -1749,6 +1809,84 @@ ohci_queue_iso_receive_dualbuffer(struct
+@@ -1749,6 +1809,81 @@ ohci_queue_iso_receive_dualbuffer(struct
  }
  
  static int
@@ -165,9 +165,6 @@
 +	u32 z, header_z, rest;
 +	int i, page, offset, packet_count, header_size;
 +
-+	/* save iso_buffer pointer for packet handling later */
-+	ctx->iso_buffer = buffer;
-+
 +	if (packet->skip) {
 +		d = context_get_descriptors(&ctx->context, 1, &d_bus);
 +		if (d == NULL)
@@ -234,7 +231,7 @@
  ohci_queue_iso(struct fw_iso_context *base,
  	       struct fw_iso_packet *packet,
  	       struct fw_iso_buffer *buffer,
-@@ -1762,8 +1900,9 @@ ohci_queue_iso(struct fw_iso_context *ba
+@@ -1762,8 +1897,9 @@ ohci_queue_iso(struct fw_iso_context *ba
  		return ohci_queue_iso_receive_dualbuffer(base, packet,
  							 buffer, payload);
  	else