summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarro Haan <hrhaan@gmail.com>2011-10-10 14:38:27 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-11 09:35:16 -0800
commit7eede2cbc1066124a0a4fee4d9671e28f7c62277 (patch)
tree538804b241ed227c23f89164dc39bad6eb811e3a
parentcd0712116761eed1500b2272a5492d2120c30f26 (diff)
USB: fix ehci alignment error
commit 276532ba9666b36974cbe16f303fc8be99c9da17 upstream. The Kirkwood gave an unaligned memory access error on line 742 of drivers/usb/host/echi-hcd.c: "ehci->last_periodic_enable = ktime_get_real();" Signed-off-by: Harro Haan <hrhaan@gmail.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--include/linux/usb/hcd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index 0097136ba45d..c0ecc5a2ef9e 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -178,7 +178,7 @@ struct usb_hcd {
* this structure.
*/
unsigned long hcd_priv[0]
- __attribute__ ((aligned(sizeof(unsigned long))));
+ __attribute__ ((aligned(sizeof(s64))));
};
/* 2.4 does this a bit differently ... */