mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
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>
This commit is contained in:
parent
633c52dccd
commit
d84702a5d7
2 changed files with 5 additions and 4 deletions
|
@ -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;
|
||||
|
|
|
@ -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 = {
|
||||
|
|
Loading…
Reference in a new issue