git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
drivers
/
acpi
/
device_sysfs.c
diff --git
a/drivers/acpi/device_sysfs.c
b/drivers/acpi/device_sysfs.c
index d5d6403ba07bce89929ced1df6d478e14b55b42f..120873dad2cc56addea2edad6135a2d055a848f9 100644
(file)
--- a/
drivers/acpi/device_sysfs.c
+++ b/
drivers/acpi/device_sysfs.c
@@
-376,7
+376,7
@@
eject_store(struct device *d, struct device_attribute *attr,
return -EINVAL;
if ((!acpi_device->handler || !acpi_device->handler->hotplug.enabled)
- && !
acpi_device
->driver)
+ && !
d
->driver)
return -ENODEV;
status = acpi_get_type(acpi_device->handle, ¬_used);