Merge branches 'release' and 'dock' into release
This commit is contained in:
commit
13d93924f1
|
@ -710,6 +710,7 @@ static ssize_t write_undock(struct device *dev, struct device_attribute *attr,
|
|||
if (!count)
|
||||
return -EINVAL;
|
||||
|
||||
begin_undock(dock_station);
|
||||
ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST);
|
||||
return ret ? ret: count;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue