summaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2012-06-13 22:29:20 +0200
committerStefan Richter <stefanr@s5r6.in-berlin.de>2012-06-17 19:35:26 +0200
commite18907cc8a3cd6e09510632b753b8b6fefa1752a (patch)
treea921639b9180e38bc403c38995999af1a9c44e21 /drivers/firewire
parent9d23f9e946ad757344792a20ba5152f3a921688b (diff)
downloadop-kernel-dev-e18907cc8a3cd6e09510632b753b8b6fefa1752a.zip
op-kernel-dev-e18907cc8a3cd6e09510632b753b8b6fefa1752a.tar.gz
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.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 922cd26..c788dbd 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -2279,6 +2279,11 @@ static int ohci_enable(struct fw_card *card,
ohci->bus_time_running = false;
+ for (i = 0; i < 32; i++)
+ if (ohci->ir_context_support & (1 << i))
+ reg_write(ohci, OHCI1394_IsoRcvContextControlClear(i),
+ IR_CONTEXT_MULTI_CHANNEL_MODE);
+
version = reg_read(ohci, OHCI1394_Version) & 0x00ff00ff;
if (version >= OHCI_VERSION_1_1) {
reg_write(ohci, OHCI1394_InitialChannelsAvailableHi,
OpenPOWER on IntegriCloud