projects
/
openwrt
/
staging
/
mkresin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 4.4 to 4.4.83
[openwrt/staging/mkresin.git]
/
target
/
linux
/
generic
/
pending-4.4
/
811-pci_disable_usb_common_quirks.patch
diff --git
a/target/linux/generic/pending-4.4/811-pci_disable_usb_common_quirks.patch
b/target/linux/generic/pending-4.4/811-pci_disable_usb_common_quirks.patch
index f22bf804effe07513afcc82c4a6711b5a7610cbc..c990681067f1c3bd99a7d329626bdfbb6471d298 100644
(file)
--- a/
target/linux/generic/pending-4.4/811-pci_disable_usb_common_quirks.patch
+++ b/
target/linux/generic/pending-4.4/811-pci_disable_usb_common_quirks.patch
@@
-1,7
+1,7
@@
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
-@@ -9
7,6 +97
,8 @@ struct amd_chipset_type {
+@@ -9
8,6 +98
,8 @@ struct amd_chipset_type {
u8 rev;
};
u8 rev;
};
@@
-10,7
+10,7
@@
static struct amd_chipset_info {
struct pci_dev *nb_dev;
struct pci_dev *smbus_dev;
static struct amd_chipset_info {
struct pci_dev *nb_dev;
struct pci_dev *smbus_dev;
-@@ -45
0,6 +452
,10 @@ void usb_amd_dev_put(void)
+@@ -45
7,6 +459
,10 @@ void usb_amd_dev_put(void)
}
EXPORT_SYMBOL_GPL(usb_amd_dev_put);
}
EXPORT_SYMBOL_GPL(usb_amd_dev_put);
@@
-21,7
+21,7
@@
/*
* Make sure the controller is completely inactive, unable to
* generate interrupts or do DMA.
/*
* Make sure the controller is completely inactive, unable to
* generate interrupts or do DMA.
-@@ -5
29,8 +535
,17 @@ reset_needed:
+@@ -5
36,8 +542
,17 @@ reset_needed:
uhci_reset_hc(pdev, base);
return 1;
}
uhci_reset_hc(pdev, base);
return 1;
}
@@
-39,7
+39,7
@@
static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
{
u16 cmd;
static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
{
u16 cmd;
-@@ -1
095,3 +1110
,4 @@ static void quirk_usb_early_handoff(stru
+@@ -1
102,3 +1117
,4 @@ static void quirk_usb_early_handoff(stru
}
DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
}
DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);