patch "USB: xhci: fix 'broken_suspend' placement in struct xchi_hcd" added to usb-linus
Subsystems (3)
This is a note to let you know that I've just added the patch titled
USB: xhci: fix 'broken_suspend' placement in struct xchi_hcd
to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
Quoted 1 line
From
2419f30a4a4fcaa5f35111563b4c61f1b2b26841Mon Sep 17 00:00:00 2001
From: Nicolas Saenz Julienne <[email protected]>
Date: Mon, 17 Dec 2018 14:37:40 +0100
Subject: USB: xhci: fix 'broken_suspend' placement in struct xchi_hcd
As commented in the struct's definition there shouldn't be anything underneath its 'priv[0]' member as it would break some macros.
The patch converts the broken_suspend into a bit-field and relocates it next to to the rest of bit-fields.
--- drivers/usb/host/xhci.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/host/xhci.h +2 -2
@@ -1863,6 +1863,8 @@ struct xhci_hcd { unsigned sw_lpm_support:1;/* support xHCI 1.0 spec USB2 hardware LPM */ unsigned hw_lpm_support:1; +/* Broken Suspend flag for SNPS Suspend resume issue */ + unsigned broken_suspend:1;/* cached usb2 extened protocol capabilites */ u32 *ext_caps;unsigned int num_ext_caps;
@@ -1880,8 +1882,6 @@ struct xhci_hcd {void *dbc;/* platform-specific data -- must come last */ unsigned long priv[0 ]__aligned(sizeof(s64)) ; -/* Broken Suspend flag for SNPS Suspend resume issue */ -u8 broken_suspend; };/* Platform specific overrides to generic XHCI hc_driver ops */
Signature · 1 line
2.20.1