redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Stefan Richter 2007-03-20 19:42:15 +01:00
parent 633c52dccd
commit d84702a5d7
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/firewire/fw-device-cdev.c
View File

@ -274,10 +274,11 @@ static int ioctl_get_info(struct client *client, void __user *arg)
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;

2
drivers/firewire/fw-device.c
View File

@ -240,7 +240,7 @@ show_rom_index_attribute(struct device *dev,
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 = {