Commit:     e254a4b45f265d9df120b83d5c2c9437902b601b
Parent:     49e1179b16fe54bfa070cd955a24c5ce82e21d16
Author:     Kristian Høgsberg <[EMAIL PROTECTED]>
AuthorDate: Wed Mar 7 12:12:38 2007 -0500
Committer:  Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Fri Mar 9 22:03:06 2007 +0100

    firewire: Clear all interrupt bits before shutting down.
    Some flaky controllers doesn't honor the masterIntEnable bits
    and can generate bus reset events even if that bit is cleared.
    Signed-off-by: Kristian Høgsberg <[EMAIL PROTECTED]>
    Signed-off-by: Stefan Richter <[EMAIL PROTECTED]>
 drivers/firewire/fw-ohci.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 5081541..3746792 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -1943,7 +1943,8 @@ static void pci_remove(struct pci_dev *dev)
        struct fw_ohci *ohci;
        ohci = pci_get_drvdata(dev);
-       reg_write(ohci, OHCI1394_IntMaskClear, OHCI1394_masterIntEnable);
+       reg_write(ohci, OHCI1394_IntMaskClear, ~0);
+       flush_writes(ohci);
        /* FIXME: Fail all pending packets here, now that the upper
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to