Browse Source

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 <geert@linux-m68k.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Kroah-Hartman 13 years ago
parent
commit
fec1868e23
1 changed files with 2 additions and 1 deletions
  1. 2 1
      include/linux/mod_devicetable.h

+ 2 - 1
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 */