diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2012-06-13 16:29:20 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2012-06-17 13:35:26 -0400 |
commit | e18907cc8a3cd6e09510632b753b8b6fefa1752a (patch) | |
tree | a921639b9180e38bc403c38995999af1a9c44e21 /drivers/firewire | |
parent | 9d23f9e946ad757344792a20ba5152f3a921688b (diff) |
firewire: ohci: initialize multiChanMode bits after reset
OHCI 1.1 says:
| Since the value of this bit is undefined after reset in all IR
| contexts, software shall initialize this bit to zero in all contexts
| whether or not active to maintain the exclusive nature of this bit.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire')
-rw-r--r-- | drivers/firewire/ohci.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 922cd26b25e3..c788dbdaf3bc 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c | |||
@@ -2279,6 +2279,11 @@ static int ohci_enable(struct fw_card *card, | |||
2279 | 2279 | ||
2280 | ohci->bus_time_running = false; | 2280 | ohci->bus_time_running = false; |
2281 | 2281 | ||
2282 | for (i = 0; i < 32; i++) | ||
2283 | if (ohci->ir_context_support & (1 << i)) | ||
2284 | reg_write(ohci, OHCI1394_IsoRcvContextControlClear(i), | ||
2285 | IR_CONTEXT_MULTI_CHANNEL_MODE); | ||
2286 | |||
2282 | version = reg_read(ohci, OHCI1394_Version) & 0x00ff00ff; | 2287 | version = reg_read(ohci, OHCI1394_Version) & 0x00ff00ff; |
2283 | if (version >= OHCI_VERSION_1_1) { | 2288 | if (version >= OHCI_VERSION_1_1) { |
2284 | reg_write(ohci, OHCI1394_InitialChannelsAvailableHi, | 2289 | reg_write(ohci, OHCI1394_InitialChannelsAvailableHi, |