ssb: Fix pcicore cardbus mode
This fixes the pcicore driver to not die a horrible crash death when inserting a cardbus card. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
committed by
John W. Linville
parent
53521d8c90
commit
7cb4461520
@@ -282,6 +282,8 @@ struct ssb_bus {
|
||||
struct ssb_boardinfo boardinfo;
|
||||
/* Contents of the SPROM. */
|
||||
struct ssb_sprom sprom;
|
||||
/* If the board has a cardbus slot, this is set to true. */
|
||||
bool has_cardbus_slot;
|
||||
|
||||
#ifdef CONFIG_SSB_EMBEDDED
|
||||
/* Lock for GPIO register access. */
|
||||
@@ -299,8 +301,13 @@ struct ssb_bus {
|
||||
|
||||
/* The initialization-invariants. */
|
||||
struct ssb_init_invariants {
|
||||
/* Versioning information about the PCB. */
|
||||
struct ssb_boardinfo boardinfo;
|
||||
/* The SPROM information. That's either stored in an
|
||||
* EEPROM or NVRAM on the board. */
|
||||
struct ssb_sprom sprom;
|
||||
/* If the board has a cardbus slot, this is set to true. */
|
||||
bool has_cardbus_slot;
|
||||
};
|
||||
/* Type of function to fetch the invariants. */
|
||||
typedef int (*ssb_invariants_func_t)(struct ssb_bus *bus,
|
||||
|
Reference in New Issue
Block a user