From: Greg Kroah-Hartman Date: Mon, 18 Jun 2012 22:38:22 +0000 (-0700) Subject: USB: properly pad out usb_device_id.driver_info X-Git-Tag: upstream/snapshot3+hdmi~6973^2~24^2~55 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fec1868e23099023bc545e199b78d99840b1abc9;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git USB: properly pad out usb_device_id.driver_info On some systems, struct usb_device_id doesn't align properly due to the recent changes in it. So pad out the driver_info field to align on a boundry that systems can handle it. Reported-by: Geert Uytterhoeven Acked-by: Geert Uytterhoeven Cc: Bjørn Mork Signed-off-by: Greg Kroah-Hartman --- diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 7771d45..6955045 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -122,7 +122,8 @@ struct usb_device_id { __u8 bInterfaceNumber; /* not matched against */ - kernel_ulong_t driver_info; + kernel_ulong_t driver_info + __attribute__((aligned(sizeof(kernel_ulong_t)))); }; /* Some useful macros to use to create struct usb_device_id */