rpms/kernel/F-8 linux-2.6-firewire-log-ohci-1.0-unsupported.patch, NONE, 1.1 kernel.spec, 1.237, 1.238

[Jarod Wilson (jwilson)]

Author: jwilson

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-firewire-log-ohci-1.0-unsupported.patch 
Log Message:
* Sun Oct 21 2007 Jarod Wilson <jwilson at redhat.com>
- Log warning about unimplemented isochronous I/O on
  firewire ohci 1.0 controllers (bz #344851)


linux-2.6-firewire-log-ohci-1.0-unsupported.patch:

--- NEW FILE linux-2.6-firewire-log-ohci-1.0-unsupported.patch ---
Date: Sun, 21 Oct 2007 10:43:11 +0200 (CEST)
From: Stefan Richter <stefanr at s5r6.in-berlin.de>
Subject: firewire: fw-ohci: log a note about unsupported features

because there seems to be more time needed to implement this.
Also, change related error return values to more appropriate ones.

Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
---
 drivers/firewire/fw-ohci.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Index: linux/drivers/firewire/fw-ohci.c
===================================================================
--- linux.orig/drivers/firewire/fw-ohci.c
+++ linux/drivers/firewire/fw-ohci.c
@@ -1472,7 +1472,7 @@ ohci_allocate_iso_context(struct fw_card
 	/* FIXME: We need a fallback for pre 1.1 OHCI. */
 	if (callback == handle_ir_dualbuffer_packet &&
 	    ohci->version < OHCI_VERSION_1_1)
-		return ERR_PTR(-EINVAL);
+		return ERR_PTR(-ENOSYS);
 
 	spin_lock_irqsave(&ohci->lock, flags);
 	index = ffs(*mask) - 1;
@@ -1791,7 +1791,7 @@ ohci_queue_iso(struct fw_iso_context *ba
 							 buffer, payload);
 	else
 		/* FIXME: Implement fallback for OHCI 1.0 controllers. */
-		return -EINVAL;
+		return -ENOSYS;
 }
 
 static const struct fw_card_driver ohci_driver = {
@@ -1911,7 +1911,12 @@ pci_probe(struct pci_dev *dev, const str
 	ohci->version = reg_read(ohci, OHCI1394_Version) & 0x00ff00ff;
 	fw_notify("Added fw-ohci device %s, OHCI version %x.%x\n",
 		  dev->dev.bus_id, ohci->version >> 16, ohci->version & 0xff);
-
+	if (ohci->version < OHCI_VERSION_1_1) {
+		fw_notify("    Isochronous I/O is not yet implemented for "
+			  "OHCI 1.0 chips.\n");
+		fw_notify("    Cameras, audio devices etc. won't work on "
+			  "this controller with this driver version.\n");
+	}
 	return 0;
 
  fail_self_id:


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- kernel.spec	19 Oct 2007 17:43:13 -0000	1.237
+++ kernel.spec	22 Oct 2007 03:04:28 -0000	1.238
@@ -689,6 +689,8 @@
 
 # Fix lockdep bug in firewire.
 Patch1900: linux-2.6-firewire-lockdep.patch
+# Log note re: OHCI 1.0 not supporting isochronous I/O
+Patch1910: linux-2.6-firewire-log-ohci-1.0-unsupported.patch
 # Work around E100 NAPI bug
 Patch2000: linux-2.6-net-e100-disable-polling.patch
 # fix thinkpad key events for volume/brightness
@@ -1251,6 +1253,7 @@
 ApplyPatch linux-2.6-lirc.patch
 
 ApplyPatch linux-2.6-firewire-lockdep.patch
+ApplyPatch linux-2.6-firewire-log-ohci-1.0-unsupported.patch
 ApplyPatch linux-2.6-net-e100-disable-polling.patch
 ApplyPatch linux-2.6-thinkpad-key-events.patch
 
@@ -1859,6 +1862,10 @@
 
 
 %changelog
+* Sun Oct 21 2007 Jarod Wilson <jwilson at redhat.com>
+- Log warning about unimplemented isochronous I/O on
+  firewire ohci 1.0 controllers (bz #344851)
+
 * Fri Oct 19 2007 John W. Linville <linville at redhat.com>
 - iwl4965-base.c: fix off-by-one errors
 - ipw2100: send WEXT scan events