Date: Tue, 20 Mar 2007 19:42:15 +0100 (CET)
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Subject: firewire: fix compiler warnings on 64bit

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Index: linux/drivers/firewire/fw-device.c
===================================================================
--- linux.orig/drivers/firewire/fw-device.c
+++ linux/drivers/firewire/fw-device.c
@@ -240,7 +240,7 @@ show_rom_index_attribute(struct device *
 	struct fw_unit *unit = fw_unit(dev);
 
 	return snprintf(buf, PAGE_SIZE, "%d\n",
-			unit->directory - device->config_rom);
+			(int)(unit->directory - device->config_rom));
 }
 
 static struct device_attribute rom_index_attribute = {
Index: linux/drivers/firewire/fw-device-cdev.c
===================================================================
--- linux.orig/drivers/firewire/fw-device-cdev.c
+++ linux/drivers/firewire/fw-device-cdev.c
@@ -274,10 +274,11 @@ static int ioctl_get_info(struct client 
 
 	if (get_info.rom != 0) {
 		void __user *uptr = u64_to_uptr(get_info.rom);
-		size_t length = min(get_info.rom_length,
-				    client->device->config_rom_length * 4);
+		size_t want = get_info.rom_length;
+		size_t have = client->device->config_rom_length * 4;
 
-		if (copy_to_user(uptr, client->device->config_rom, length))
+		if (copy_to_user(uptr, client->device->config_rom,
+				 min(want, have)))
 			return -EFAULT;
 	}
 	get_info.rom_length = client->device->config_rom_length * 4;