i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

acpi_button: use user_memcpy to write the user buffer.

Browse Source 
* fix warning on x86_64.
This commit is contained in:
Jérôme Duval
2018-02-28 18:37:46 +01:00
parent 821f3e571b
commit 6470e36518
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/power/acpi_button/acpi_button.cpp
+5 -4
View File
@@ -168,13 +168,14 @@ acpi_button_open(void *_cookie, const char *path, int flags, void** cookie)
static status_t static status_t
acpi_button_read(void* _cookie, off_t position, void *buf, size_t* num_bytes) acpi_button_read(void* _cookie, off_t position, void *buffer, size_t* num_bytes)
{ {
acpi_button_device_info* device = (acpi_button_device_info*)_cookie; acpi_button_device_info* device = (acpi_button_device_info*)_cookie;
if (*num_bytes < 1) if (*num_bytes < sizeof(uint8))
return B_IO_ERROR; return B_IO_ERROR;
*((uint8 *)(buf)) = device->last_status; if (user_memcpy(buffer, &device->last_status, sizeof(uint8)) < B_OK)
return B_BAD_ADDRESS;
device->last_status = 0; device->last_status = 0;
*num_bytes = 1; *num_bytes = 1;
@@ -209,7 +210,7 @@ acpi_button_select(void *_cookie, uint8 event, selectsync *sync)
status_t error = add_select_sync_pool_entry(&device->select_pool, sync, status_t error = add_select_sync_pool_entry(&device->select_pool, sync,
event); event);
if (error != B_OK) { if (error != B_OK) {
ERROR("add_select_sync_pool_entry() failed: %#lx\n", error); ERROR("add_select_sync_pool_entry() failed: %" B_PRId32 "\n", error);
return error; return error;
} }