Commit c7db7ba5 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'misc' into release

parents 39340925 50d716e4
...@@ -67,7 +67,7 @@ struct dock_station { ...@@ -67,7 +67,7 @@ struct dock_station {
struct list_head dependent_devices; struct list_head dependent_devices;
struct list_head hotplug_devices; struct list_head hotplug_devices;
struct list_head sibiling; struct list_head sibling;
struct platform_device *dock_device; struct platform_device *dock_device;
}; };
static LIST_HEAD(dock_stations); static LIST_HEAD(dock_stations);
...@@ -275,7 +275,7 @@ int is_dock_device(acpi_handle handle) ...@@ -275,7 +275,7 @@ int is_dock_device(acpi_handle handle)
if (is_dock(handle)) if (is_dock(handle))
return 1; return 1;
list_for_each_entry(dock_station, &dock_stations, sibiling) { list_for_each_entry(dock_station, &dock_stations, sibling) {
if (find_dock_dependent_device(dock_station, handle)) if (find_dock_dependent_device(dock_station, handle))
return 1; return 1;
} }
...@@ -619,7 +619,7 @@ register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops, ...@@ -619,7 +619,7 @@ register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops,
* make sure this handle is for a device dependent on the dock, * make sure this handle is for a device dependent on the dock,
* this would include the dock station itself * this would include the dock station itself
*/ */
list_for_each_entry(dock_station, &dock_stations, sibiling) { list_for_each_entry(dock_station, &dock_stations, sibling) {
/* /*
* An ATA bay can be in a dock and itself can be ejected * An ATA bay can be in a dock and itself can be ejected
* seperately, so there are two 'dock stations' which need the * seperately, so there are two 'dock stations' which need the
...@@ -651,7 +651,7 @@ void unregister_hotplug_dock_device(acpi_handle handle) ...@@ -651,7 +651,7 @@ void unregister_hotplug_dock_device(acpi_handle handle)
if (!dock_station_count) if (!dock_station_count)
return; return;
list_for_each_entry(dock_station, &dock_stations, sibiling) { list_for_each_entry(dock_station, &dock_stations, sibling) {
dd = find_dock_dependent_device(dock_station, handle); dd = find_dock_dependent_device(dock_station, handle);
if (dd) if (dd)
dock_del_hotplug_device(dock_station, dd); dock_del_hotplug_device(dock_station, dd);
...@@ -787,7 +787,7 @@ static int acpi_dock_notifier_call(struct notifier_block *this, ...@@ -787,7 +787,7 @@ static int acpi_dock_notifier_call(struct notifier_block *this,
if (event != ACPI_NOTIFY_BUS_CHECK && event != ACPI_NOTIFY_DEVICE_CHECK if (event != ACPI_NOTIFY_BUS_CHECK && event != ACPI_NOTIFY_DEVICE_CHECK
&& event != ACPI_NOTIFY_EJECT_REQUEST) && event != ACPI_NOTIFY_EJECT_REQUEST)
return 0; return 0;
list_for_each_entry(dock_station, &dock_stations, sibiling) { list_for_each_entry(dock_station, &dock_stations, sibling) {
if (dock_station->handle == handle) { if (dock_station->handle == handle) {
struct dock_data *dock_data; struct dock_data *dock_data;
...@@ -958,7 +958,7 @@ static int dock_add(acpi_handle handle) ...@@ -958,7 +958,7 @@ static int dock_add(acpi_handle handle)
dock_station->last_dock_time = jiffies - HZ; dock_station->last_dock_time = jiffies - HZ;
INIT_LIST_HEAD(&dock_station->dependent_devices); INIT_LIST_HEAD(&dock_station->dependent_devices);
INIT_LIST_HEAD(&dock_station->hotplug_devices); INIT_LIST_HEAD(&dock_station->hotplug_devices);
INIT_LIST_HEAD(&dock_station->sibiling); INIT_LIST_HEAD(&dock_station->sibling);
spin_lock_init(&dock_station->dd_lock); spin_lock_init(&dock_station->dd_lock);
mutex_init(&dock_station->hp_lock); mutex_init(&dock_station->hp_lock);
ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list); ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list);
...@@ -1044,7 +1044,7 @@ static int dock_add(acpi_handle handle) ...@@ -1044,7 +1044,7 @@ static int dock_add(acpi_handle handle)
add_dock_dependent_device(dock_station, dd); add_dock_dependent_device(dock_station, dd);
dock_station_count++; dock_station_count++;
list_add(&dock_station->sibiling, &dock_stations); list_add(&dock_station->sibling, &dock_stations);
return 0; return 0;
dock_add_err_unregister: dock_add_err_unregister:
...@@ -1149,7 +1149,7 @@ static void __exit dock_exit(void) ...@@ -1149,7 +1149,7 @@ static void __exit dock_exit(void)
struct dock_station *tmp; struct dock_station *tmp;
unregister_acpi_bus_notifier(&dock_acpi_notifier); unregister_acpi_bus_notifier(&dock_acpi_notifier);
list_for_each_entry_safe(dock_station, tmp, &dock_stations, sibiling) list_for_each_entry_safe(dock_station, tmp, &dock_stations, sibling)
dock_remove(dock_station); dock_remove(dock_station);
} }
......
...@@ -398,6 +398,8 @@ acpi_system_write_wakeup_device(struct file *file, ...@@ -398,6 +398,8 @@ acpi_system_write_wakeup_device(struct file *file,
if (len > 4) if (len > 4)
len = 4; len = 4;
if (len < 0)
return -EFAULT;
if (copy_from_user(strbuf, buffer, len)) if (copy_from_user(strbuf, buffer, len))
return -EFAULT; return -EFAULT;
......
...@@ -863,13 +863,6 @@ static int acpi_processor_add(struct acpi_device *device) ...@@ -863,13 +863,6 @@ static int acpi_processor_add(struct acpi_device *device)
goto err_remove_sysfs; goto err_remove_sysfs;
} }
if (pr->flags.throttling) {
printk(KERN_INFO PREFIX "%s [%s] (supports",
acpi_device_name(device), acpi_device_bid(device));
printk(" %d throttling states", pr->throttling.state_count);
printk(")\n");
}
return 0; return 0;
err_remove_sysfs: err_remove_sysfs:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment