Skip to content

Commit

Permalink
USB: properly pad out usb_device_id.driver_info
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Jun 18, 2012
1 parent 71c421d commit fec1868
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion include/linux/mod_devicetable.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit fec1868

Please sign in to comment.