evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: slicoss: fail on corrupt eeprom

Browse source 
Remove fail_on_bad_eeprom, which was always 0 and thus being used
to ignore incorrect checksumming. This means devices with corrupt
eeprom will now cause the driver to fail.

Since fail_on_bad_eeprom was the last member in use of struct
slic_reg_params, remove that struct altogether.

Signed-off-by: David Matlack <matlackdavid@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
David Matlack 2014-05-19 22:04:00 -07:00 • committed by Greg Kroah-Hartman
parent 55b62cdfe9
commit 28277a55fd
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/staging/slicoss/slic.h
View file

@ -362,12 +362,6 @@ struct slic_shmem {
volatile struct slic_stats inicstats; volatile struct slic_stats inicstats;
}; };
struct slic_reg_params {
u32 linkspeed;
u32 linkduplex;
u32 fail_on_bad_eeprom;
};
struct slic_upr { struct slic_upr {
uint adapter; uint adapter;
u32 upr_request; u32 upr_request;
@ -493,7 +487,6 @@ struct adapter {
u32 intagg_period; u32 intagg_period;
struct inicpm_state *inicpm_info; struct inicpm_state *inicpm_info;
void *pinicpm_info; void *pinicpm_info;
struct slic_reg_params reg_params;
struct slic_ifevents if_events; struct slic_ifevents if_events;
struct slic_stats inicstats_prev; struct slic_stats inicstats_prev;
struct slicnet_stats slic_stats; struct slicnet_stats slic_stats;

3
drivers/staging/slicoss/slicoss.c
View file

@ -2850,8 +2850,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
sizeof(struct slic_eeprom), sizeof(struct slic_eeprom),
peeprom, phys_config); peeprom, phys_config);
if ((!card->config.EepromValid) && if (!card->config.EepromValid) {
(adapter->reg_params.fail_on_bad_eeprom)) {
slic_reg64_write(adapter, &slic_regs->slic_isp, 0, slic_reg64_write(adapter, &slic_regs->slic_isp, 0,
&slic_regs->slic_addr_upper, &slic_regs->slic_addr_upper,
0, FLUSH); 0, FLUSH);