File tree Expand file tree Collapse file tree 3 files changed +6
-6
lines changed
reactos/drivers/bus/acpi/busmgr Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -1298,7 +1298,7 @@ acpi_bus_add (
1298
1298
* ----
1299
1299
* Fix for the system root bus device -- the only root-level device.
1300
1300
*/
1301
- if ((parent == ACPI_ROOT_OBJECT ) && (type == ACPI_BUS_TYPE_DEVICE )) {
1301
+ if ((( ACPI_HANDLE ) parent == ACPI_ROOT_OBJECT ) && (type == ACPI_BUS_TYPE_DEVICE )) {
1302
1302
hid = ACPI_BUS_HID ;
1303
1303
sprintf (device -> pnp .device_name , "%s" , ACPI_BUS_DEVICE_NAME );
1304
1304
sprintf (device -> pnp .device_class , "%s" , ACPI_BUS_CLASS );
Original file line number Diff line number Diff line change @@ -61,7 +61,7 @@ int acpi_power_nocheck;
61
61
62
62
static int acpi_power_add (struct acpi_device * device );
63
63
static int acpi_power_remove (struct acpi_device * device , int type );
64
- static int acpi_power_resume (struct acpi_device * device );
64
+ static int acpi_power_resume (struct acpi_device * device , int state );
65
65
66
66
static struct acpi_driver acpi_power_driver = {
67
67
.name = ACPI_POWER_DRIVER_NAME ,
@@ -128,7 +128,7 @@ acpi_power_get_state (
128
128
int * state )
129
129
{
130
130
ACPI_STATUS status = AE_OK ;
131
- unsigned long sta = 0 ;
131
+ unsigned long long sta = 0 ;
132
132
char node_name [5 ];
133
133
ACPI_BUFFER buffer = { sizeof (node_name ), node_name };
134
134
@@ -632,9 +632,9 @@ acpi_power_remove (
632
632
return_VALUE (0 );
633
633
}
634
634
635
- static int acpi_power_resume (struct acpi_device * device )
635
+ static int acpi_power_resume (struct acpi_device * device , int state )
636
636
{
637
- int result = 0 , state ;
637
+ int result = 0 ;
638
638
struct acpi_power_resource * resource = NULL ;
639
639
struct acpi_power_reference * ref ;
640
640
Original file line number Diff line number Diff line change @@ -166,7 +166,7 @@ acpi_extract_package (
166
166
}
167
167
168
168
head = buffer -> Pointer ;
169
- tail = buffer -> Pointer + tail_offset ;
169
+ tail = (( PUCHAR ) buffer -> Pointer ) + tail_offset ;
170
170
171
171
/*
172
172
* Extract package data.
You can’t perform that action at this time.
0 commit comments