aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/dock.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/dock.c')
-rw-r--r--drivers/acpi/dock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 7d2edf143f16..94857112b64d 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -229,7 +229,7 @@ EXPORT_SYMBOL_GPL(is_dock_device);
229 */ 229 */
230static int dock_present(struct dock_station *ds) 230static int dock_present(struct dock_station *ds)
231{ 231{
232 unsigned long sta; 232 unsigned long long sta;
233 acpi_status status; 233 acpi_status status;
234 234
235 if (ds) { 235 if (ds) {
@@ -727,13 +727,13 @@ static DEVICE_ATTR(undock, S_IWUSR, NULL, write_undock);
727static ssize_t show_dock_uid(struct device *dev, 727static ssize_t show_dock_uid(struct device *dev,
728 struct device_attribute *attr, char *buf) 728 struct device_attribute *attr, char *buf)
729{ 729{
730 unsigned long lbuf; 730 unsigned long long lbuf;
731 acpi_status status = acpi_evaluate_integer(dock_station->handle, 731 acpi_status status = acpi_evaluate_integer(dock_station->handle,
732 "_UID", NULL, &lbuf); 732 "_UID", NULL, &lbuf);
733 if (ACPI_FAILURE(status)) 733 if (ACPI_FAILURE(status))
734 return 0; 734 return 0;
735 735
736 return snprintf(buf, PAGE_SIZE, "%lx\n", lbuf); 736 return snprintf(buf, PAGE_SIZE, "%llx\n", lbuf);
737} 737}
738static DEVICE_ATTR(uid, S_IRUGO, show_dock_uid, NULL); 738static DEVICE_ATTR(uid, S_IRUGO, show_dock_uid, NULL);
739 739