| Message ID | 20191015120953.2597-4-tbogendoerfer@suse.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Use MFD framework for SGI IOC3 drivers | expand |
On Tue, Oct 15, 2019 at 02:09:48PM +0200, Thomas Bogendoerfer wrote: > Generation of fake subdevice ID had vendor and device ID swapped. > > Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de> > --- > arch/mips/pci/pci-xtalk-bridge.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/mips/pci/pci-xtalk-bridge.c b/arch/mips/pci/pci-xtalk-bridge.c > index dcf6117a17c3..d1d5f54c2632 100644 > --- a/arch/mips/pci/pci-xtalk-bridge.c > +++ b/arch/mips/pci/pci-xtalk-bridge.c > @@ -437,7 +437,7 @@ static int bridge_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) > return irq; > } > > -#define IOC3_SID(sid) (PCI_VENDOR_ID_SGI << 16 | (sid)) > +#define IOC3_SID(sid) (PCI_VENDOR_ID_SGI | ((sid) << 16)) > > static void bridge_setup_ip27_baseio6g(struct bridge_controller *bc) > { > -- > 2.16.4 Paul, can you take this patch and patch 6/6 of this series into mips-linux for 5.5 ? I will submit patch 4/6 and 5/6 after the merge window via net-next then. Thomas.
diff --git a/arch/mips/pci/pci-xtalk-bridge.c b/arch/mips/pci/pci-xtalk-bridge.c index dcf6117a17c3..d1d5f54c2632 100644 --- a/arch/mips/pci/pci-xtalk-bridge.c +++ b/arch/mips/pci/pci-xtalk-bridge.c @@ -437,7 +437,7 @@ static int bridge_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) return irq; } -#define IOC3_SID(sid) (PCI_VENDOR_ID_SGI << 16 | (sid)) +#define IOC3_SID(sid) (PCI_VENDOR_ID_SGI | ((sid) << 16)) static void bridge_setup_ip27_baseio6g(struct bridge_controller *bc) {
Generation of fake subdevice ID had vendor and device ID swapped. Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de> --- arch/mips/pci/pci-xtalk-bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)