diff options
author | Zoltan Herpai <wigyori@uid0.hu> | 2016-09-29 15:49:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-29 15:49:20 +0200 |
commit | ca3f1a614a1ee90fc67188b375888517f0c151df (patch) | |
tree | 930c456200793be1ec731e819aa0dd2e4b0b0dbf /target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch | |
parent | d6b3ca24c50047af58135ad3090f7a3a25eee35d (diff) | |
parent | f9755e28776fdce0c2136492b43380d0eefe3c5a (diff) | |
download | upstream-ca3f1a614a1ee90fc67188b375888517f0c151df.tar.gz upstream-ca3f1a614a1ee90fc67188b375888517f0c151df.tar.bz2 upstream-ca3f1a614a1ee90fc67188b375888517f0c151df.zip |
Merge pull request #105 from wigyori/chaos_calmer
CC: openssl security upgrade, sync updates from git.openwrt.org/chaos_calmer
Diffstat (limited to 'target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch')
-rw-r--r-- | target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch b/target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch index 05835df0da..c60de181cc 100644 --- a/target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch +++ b/target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch @@ -90,5 +90,5 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> +#endif /* CONFIG_ARCH_BCM_5301X */ + if (!ret) - xhci->xhc_state &= ~(XHCI_STATE_HALTED | XHCI_STATE_DYING); - + /* clear state flags. Including dying, halted or removing */ + xhci->xhc_state = 0; |