Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire, ieee1394: update Kconfig help
  firewire, ieee1394: update MAINTAINERS entries
  firewire: ohci: always use packet-per-buffer mode for isochronous reception
  firewire: cdev: fix another memory leak in an error path
  firewire: fix use of multiple AV/C devices, allow multiple FCP listeners

Comments from Stefan:

   Distributors who still ship the old stack (ieee1394, ohci1394,
   raw1394, sbp2, eth1394 and more) should now switch to the new one
   (firewire-core, firewire-ohci, firewire-sbp2, firewire-net).  In the
   first iteration, those distributors might want to ship the old stack
   also (but blacklisted) as a fallback for their users if unforeseen
   problems with the newer replacement drivers are encountered.

   The older FireWire stack contains several known problems which are
   not going to be fixed; instead, those issues are addressed by the new
   stack.  An incomplete list of these issues is kept in bugzilla:

	http://bugzilla.kernel.org/show_bug.cgi?id=10046

   We have a guide on migration from the older to the newer stack:

	http://ieee1394.wiki.kernel.org/index.php/Juju_Migration

1 files changed, 2 insertions, 10 deletions

diff --git a/drivers/media/dvb/firewire/firedtv-fw.c b/drivers/media/dvb/firewire/firedtv-fw.c
index fe44789ab037..6223bf01efe9 100644
--- a/drivers/media/dvb/firewire/firedtv-fw.c
+++ b/drivers/media/dvb/firewire/firedtv-fw.c
@@ -202,14 +202,8 @@ static void handle_fcp(struct fw_card *card, struct fw_request *request,
         unsigned long flags;
         int su;
 
-        if ((tcode != TCODE_WRITE_QUADLET_REQUEST &&
-             tcode != TCODE_WRITE_BLOCK_REQUEST) ||
-            offset != CSR_REGISTER_BASE + CSR_FCP_RESPONSE ||
-            length == 0 ||
-            (((u8 *)payload)[0] & 0xf0) != 0) {
-                fw_send_response(card, request, RCODE_TYPE_ERROR);
+        if (length < 2 || (((u8 *)payload)[0] & 0xf0) != 0)
                 return;
-        }
 
         su = ((u8 *)payload)[1] & 0x7;
 
@@ -230,10 +224,8 @@ static void handle_fcp(struct fw_card *card, struct fw_request *request,
         }
         spin_unlock_irqrestore(&node_list_lock, flags);
 
-        if (fdtv) {
+        if (fdtv)
                 avc_recv(fdtv, payload, length);
-                fw_send_response(card, request, RCODE_COMPLETE);
-        }
 }
 
 static struct fw_address_handler fcp_handler = {