From a49d363809c4a0627645b18720b2add5d06c08fe Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Thu, 4 Jun 2009 21:08:43 +0200
Subject: [PATCH] --- yaml --- r: 151487 b: refs/heads/master c:
 3dcdc50079bc2c9dbc6524518976353f743f7ec8 h: refs/heads/master i:   151485:
 cd056b72090fcab1a8f3b6e02bc8589d07168d15   151483:
 9837c6110c9530f9900fa4b14d7fffec35205a3c   151479:
 63a3b355594faf657716d88bfb40244162d8b996   151471:
 31dfed88c582b9a73e8e2f3540964309f319b21f   151455:
 b1ba93dad8d3edbf057da2d08cb8d3e5fffee261   151423:
 ede0faa665b66d95a66ca23ccf29b08ba4d98d2a v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/firewire/fw-ohci.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 71d4c5d1fd7b..367e1c15e0ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e41f8d709c31b42129a34305a99d29c38aff75c4
+refs/heads/master: 3dcdc50079bc2c9dbc6524518976353f743f7ec8
diff --git a/trunk/drivers/firewire/fw-ohci.c b/trunk/drivers/firewire/fw-ohci.c
index 1180d0be0bb4..1b6590f92543 100644
--- a/trunk/drivers/firewire/fw-ohci.c
+++ b/trunk/drivers/firewire/fw-ohci.c
@@ -31,6 +31,7 @@
 #include <linux/pci.h>
 #include <linux/spinlock.h>
 
+#include <asm/atomic.h>
 #include <asm/page.h>
 #include <asm/system.h>
 
@@ -178,7 +179,7 @@ struct fw_ohci {
 	int node_id;
 	int generation;
 	int request_generation;	/* for timestamping incoming requests */
-	u32 bus_seconds;
+	atomic_t bus_seconds;
 
 	bool use_dualbuffer;
 	bool old_uninorth;
@@ -1434,7 +1435,7 @@ static irqreturn_t irq_handler(int irq, void *data)
 	if (event & OHCI1394_cycle64Seconds) {
 		cycle_time = reg_read(ohci, OHCI1394_IsochronousCycleTimer);
 		if ((cycle_time & 0x80000000) == 0)
-			ohci->bus_seconds++;
+			atomic_inc(&ohci->bus_seconds);
 	}
 
 	return IRQ_HANDLED;
@@ -1770,7 +1771,7 @@ static u64 ohci_get_bus_time(struct fw_card *card)
 	u64 bus_time;
 
 	cycle_time = reg_read(ohci, OHCI1394_IsochronousCycleTimer);
-	bus_time = ((u64) ohci->bus_seconds << 32) | cycle_time;
+	bus_time = ((u64)atomic_read(&ohci->bus_seconds) << 32) | cycle_time;
 
 	return bus_time;
 }