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

Commit 28277a55 authored by David Matlack's avatar David Matlack Committed by Greg Kroah-Hartman
Browse files

staging: slicoss: fail on corrupt eeprom 



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: default avatarDavid Matlack <matlackdavid@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 55b62cdf

drivers/staging/slicoss/slic.h

+0 −7
Original line number Diff line number Diff line
@@ -362,12 +362,6 @@ struct slic_shmem { 
	volatile struct slic_stats     inicstats;

};



struct slic_reg_params {

	u32       linkspeed;

	u32       linkduplex;

	u32       fail_on_bad_eeprom;

};



struct slic_upr {

	uint               adapter;

	u32            upr_request;
@@ -493,7 +487,6 @@ struct adapter { 
	u32             intagg_period;

	struct inicpm_state    *inicpm_info;

	void *pinicpm_info;

	struct slic_reg_params   reg_params;

	struct slic_ifevents  if_events;

	struct slic_stats        inicstats_prev;

	struct slicnet_stats     slic_stats;

drivers/staging/slicoss/slicoss.c

+1 −2
Original line number Diff line number Diff line
@@ -2850,8 +2850,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter) 
				    sizeof(struct slic_eeprom),

				    peeprom, phys_config);



		if ((!card->config.EepromValid) &&

		    (adapter->reg_params.fail_on_bad_eeprom)) {

		if (!card->config.EepromValid) {

			slic_reg64_write(adapter, &slic_regs->slic_isp, 0,

					 &slic_regs->slic_addr_upper,

					 0, FLUSH);