Commit ddcd2bb1 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] acpiphp_ibm.c 64bit portability

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fd442eb6
...@@ -340,7 +340,7 @@ static ssize_t ibm_read_apci_table(struct kobject *kobj, ...@@ -340,7 +340,7 @@ static ssize_t ibm_read_apci_table(struct kobject *kobj,
int bytes_read = -EINVAL; int bytes_read = -EINVAL;
char *table = NULL; char *table = NULL;
dbg("%s: pos = %d, size = %d\n", __FUNCTION__, (int)pos, size); dbg("%s: pos = %d, size = %zd\n", __FUNCTION__, (int)pos, size);
if (pos == 0) { if (pos == 0) {
bytes_read = ibm_get_table_from_acpi(&table); bytes_read = ibm_get_table_from_acpi(&table);
...@@ -383,8 +383,8 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle, ...@@ -383,8 +383,8 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
if(info.current_status && (info.valid & ACPI_VALID_HID) && if(info.current_status && (info.valid & ACPI_VALID_HID) &&
(!strcmp(info.hardware_id.value, IBM_HARDWARE_ID1) || (!strcmp(info.hardware_id.value, IBM_HARDWARE_ID1) ||
!strcmp(info.hardware_id.value, IBM_HARDWARE_ID2))) { !strcmp(info.hardware_id.value, IBM_HARDWARE_ID2))) {
dbg("found hardware: %s, handle: %x\n", info.hardware_id.value, dbg("found hardware: %s, handle: %p\n", info.hardware_id.value,
(unsigned int)handle); handle);
*phandle = handle; *phandle = handle;
/* returning non-zero causes the search to stop /* returning non-zero causes the search to stop
* and returns this value to the caller of * and returns this value to the caller of
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment