From 23793bd9de665fab2726bfd2d6b7aa0ac615471a Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sat, 28 Aug 2010 14:21:26 +0200 Subject: [PATCH] --- yaml --- r: 210151 b: refs/heads/master c: a4dc090b6cb445257d2a8e44f85395ced6d1ed3e h: refs/heads/master i: 210149: 0f0afc457fe4ef702a8a06d304e09a2d552d3ecb 210147: a157d2d511fe6aa631be1a1dc6db5b1d616fd101 210143: 4f39a8be3b3a6cb19e7de7a3f28f6d9c69b31dee v: v3 --- [refs] | 2 +- trunk/drivers/firewire/ohci.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 623a6ade4a46..f04a9f62e935 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2222bcb76790f4f61f39ec1514946a7593b07e02 +refs/heads/master: a4dc090b6cb445257d2a8e44f85395ced6d1ed3e diff --git a/trunk/drivers/firewire/ohci.c b/trunk/drivers/firewire/ohci.c index 7f03540cabe8..be29b0bb2471 100644 --- a/trunk/drivers/firewire/ohci.c +++ b/trunk/drivers/firewire/ohci.c @@ -694,7 +694,15 @@ static __le32 *handle_ar_packet(struct ar_context *ctx, __le32 *buffer) log_ar_at_event('R', p.speed, p.header, evt); /* - * The OHCI bus reset handler synthesizes a phy packet with + * Several controllers, notably from NEC and VIA, forget to + * write ack_complete status at PHY packet reception. + */ + if (evt == OHCI1394_evt_no_status && + (p.header[0] & 0xff) == (OHCI1394_phy_tcode << 4)) + p.ack = ACK_COMPLETE; + + /* + * The OHCI bus reset handler synthesizes a PHY packet with * the new generation number when a bus reset happens (see * section 8.4.2.3). This helps us determine when a request * was received and make sure we send the response in the same