Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d84702a5 authored by Stefan Richter's avatar Stefan Richter
Browse files

firewire: fix compiler warnings on 64bit 



Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: default avatarKristian Høgsberg <krh@redhat.com>
parent 633c52dc

drivers/firewire/fw-device-cdev.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

drivers/firewire/fw-device.c

+1 −1
Original line number Diff line number Diff line
@@ -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 = {