diff --git a/[refs] b/[refs]
index db1ccab453c4..94cb2c55b055 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7baab9acfb25934a32541d617cbc676abd1fbf5b
+refs/heads/master: 9d23f9e946ad757344792a20ba5152f3a921688b
diff --git a/trunk/drivers/firewire/core-iso.c b/trunk/drivers/firewire/core-iso.c
index 8382e27e9a27..38c0aa60b2cb 100644
--- a/trunk/drivers/firewire/core-iso.c
+++ b/trunk/drivers/firewire/core-iso.c
@@ -146,7 +146,7 @@ EXPORT_SYMBOL(fw_iso_buffer_destroy);
 /* Convert DMA address to offset into virtually contiguous buffer. */
 size_t fw_iso_buffer_lookup(struct fw_iso_buffer *buffer, dma_addr_t completed)
 {
-	int i;
+	size_t i;
 	dma_addr_t address;
 	ssize_t offset;