---

yaml --- r: 181597 b: refs/heads/master c: 3fb80ef h: refs/heads/master i: 181595: c6d6d40 v: v3
git-mirror · Feb 26, 2010 · c9d160b · c9d160b
1 parent a59802e
commit c9d160b
Show file tree

Hide file tree

Showing 6 changed files with 265 additions and 192 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9420048c6e3ce43b428cb5965ba0d568bc145978
+refs/heads/master: 3fb80ef3bc0f2b1008e14f695dcb32415cbacc90
diff --git a/trunk/drivers/media/dvb/firewire/firedtv-1394.c b/trunk/drivers/media/dvb/firewire/firedtv-1394.c
@@ -90,13 +90,14 @@ static inline struct node_entry *node_of(struct firedtv *fdtv)
 	return container_of(fdtv->device, struct unit_directory, device)->ne;
 }
 
-static int node_lock(struct firedtv *fdtv, u64 addr, __be32 data[])
+static int node_lock(struct firedtv *fdtv, u64 addr, void *data)
 {
+	quadlet_t *d = data;
 	int ret;
 
-	ret = hpsb_node_lock(node_of(fdtv), addr, EXTCODE_COMPARE_SWAP,
-		(__force quadlet_t *)&data[1], (__force quadlet_t)data[0]);
-	data[0] = data[1];
+	ret = hpsb_node_lock(node_of(fdtv), addr,
+			     EXTCODE_COMPARE_SWAP, &d[1], d[0]);
+	d[0] = d[1];
 
 	return ret;
 }