Magellan Linux

Contents of /trunk/kernel26-alx/patches-2.6.27-r3/0116-2.6.27.17-all-fixes.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1176 - (show annotations) (download)
Thu Oct 14 15:11:06 2010 UTC (13 years, 6 months ago) by niro
File size: 674 byte(s)
-2.6.27-alx-r3: new magellan 0.5.2 kernel
1 diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
2 index eab790f..e28469e 100644
3 --- a/drivers/acpi/dock.c
4 +++ b/drivers/acpi/dock.c
5 @@ -691,14 +691,8 @@ fdd_out:
6 static ssize_t show_docked(struct device *dev,
7 struct device_attribute *attr, char *buf)
8 {
9 - struct acpi_device *tmp;
10 -
11 - struct dock_station *dock_station = *((struct dock_station **)
12 - dev->platform_data);
13 + return snprintf(buf, PAGE_SIZE, "%d\n", dock_present(dock_station));
14
15 - if (ACPI_SUCCESS(acpi_bus_get_device(dock_station->handle, &tmp)))
16 - return snprintf(buf, PAGE_SIZE, "1\n");
17 - return snprintf(buf, PAGE_SIZE, "0\n");
18 }
19 static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);
20