]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
USB: fix ehci alignment error
authorHarro Haan <hrhaan@gmail.com>
Mon, 10 Oct 2011 12:38:27 +0000 (14:38 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 11 Nov 2011 17:35:16 +0000 (09:35 -0800)
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>
include/linux/usb/hcd.h

index 0097136ba45da9a5a27fffb89df66c2aa8743302..c0ecc5a2ef9e35f68bdb031f2949099325ea6491 100644 (file)
@@ -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 ... */