]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob - releases/3.1.1/usb-fix-ehci-alignment-error.patch
Drop watchdog patch
[thirdparty/kernel/stable-queue.git] / releases / 3.1.1 / usb-fix-ehci-alignment-error.patch
1 From 276532ba9666b36974cbe16f303fc8be99c9da17 Mon Sep 17 00:00:00 2001
2 From: Harro Haan <hrhaan@gmail.com>
3 Date: Mon, 10 Oct 2011 14:38:27 +0200
4 Subject: USB: fix ehci alignment error
5
6 From: Harro Haan <hrhaan@gmail.com>
7
8 commit 276532ba9666b36974cbe16f303fc8be99c9da17 upstream.
9
10 The Kirkwood gave an unaligned memory access error on
11 line 742 of drivers/usb/host/echi-hcd.c:
12 "ehci->last_periodic_enable = ktime_get_real();"
13
14 Signed-off-by: Harro Haan <hrhaan@gmail.com>
15 Acked-by: Alan Stern <stern@rowland.harvard.edu>
16 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
17
18 ---
19 include/linux/usb/hcd.h | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22 --- a/include/linux/usb/hcd.h
23 +++ b/include/linux/usb/hcd.h
24 @@ -178,7 +178,7 @@ struct usb_hcd {
25 * this structure.
26 */
27 unsigned long hcd_priv[0]
28 - __attribute__ ((aligned(sizeof(unsigned long))));
29 + __attribute__ ((aligned(sizeof(s64))));
30 };
31
32 /* 2.4 does this a bit differently ... */