Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 304e21bb authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by John W. Linville
Browse files

ssb: PCI revision ID register is 8-bit wide 



The SSB code reads PCI revision ID register as 16-bit entity while the register
is actually 8-bit only (the next 8 bits are the programming interface register).
Fix the read and make the 'rev' field of 'struct ssb_boardinfo' 8-bit as well,
to match the register size.

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 45a77138

drivers/ssb/pci.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -738,7 +738,7 @@ static void ssb_pci_get_boardinfo(struct ssb_bus *bus, 
			     &bi->vendor);

			     &bi->vendor);

	pci_read_config_word(bus->host_pci, PCI_SUBSYSTEM_ID,

	pci_read_config_word(bus->host_pci, PCI_SUBSYSTEM_ID,

			     &bi->type);

			     &bi->type);

	pci_read_config_word(bus->host_pci, PCI_REVISION_ID,

	pci_read_config_byte(bus->host_pci, PCI_REVISION_ID,

			     &bi->rev);

			     &bi->rev);

}

}

include/linux/ssb/ssb.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -99,7 +99,7 @@ struct ssb_sprom { 
struct ssb_boardinfo {

struct ssb_boardinfo {

	u16 vendor;

	u16 vendor;

	u16 type;

	u16 type;

	u16 rev;

	u8  rev;

};

};