projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pm+acpi-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[cascardo/linux.git]
/
drivers
/
pnp
/
pnpacpi
/
core.c
diff --git
a/drivers/pnp/pnpacpi/core.c
b/drivers/pnp/pnpacpi/core.c
index
d2b780a
..
5153d1d
100644
(file)
--- a/
drivers/pnp/pnpacpi/core.c
+++ b/
drivers/pnp/pnpacpi/core.c
@@
-248,6
+248,7
@@
static int __init pnpacpi_add_device(struct acpi_device *device)
if (!dev)
return -ENOMEM;
if (!dev)
return -ENOMEM;
+ ACPI_COMPANION_SET(&dev->dev, device);
dev->data = device;
/* .enabled means the device can decode the resources */
dev->active = device->status.enabled;
dev->data = device;
/* .enabled means the device can decode the resources */
dev->active = device->status.enabled;
@@
-290,11
+291,9
@@
static int __init pnpacpi_add_device(struct acpi_device *device)
return error;
}
return error;
}
- error = acpi_bind_one(&dev->dev, device);
-
num++;
num++;
- return
error
;
+ return
0
;
}
static acpi_status __init pnpacpi_add_device_handler(acpi_handle handle,
}
static acpi_status __init pnpacpi_add_device_handler(acpi_handle handle,