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

Commit 3406118c authored by Adrian Bunk's avatar Adrian Bunk Committed by John W. Linville
Browse files

[PATCH] bcm43xx: Add error checking in bcm43xx_sprom_write() 



The Coverity checker noted that these "if (err)"'s couldn't ever be
true.

It seems the intention was to check the return values of the
bcm43xx_pci_write_config32()'s?

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ecac598b

drivers/net/wireless/bcm43xx/bcm43xx_main.c

+2 −2
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ int bcm43xx_sprom_write(struct bcm43xx_private *bcm, const u16 *sprom) 
	if (err)

		goto err_ctlreg;

	spromctl |= 0x10; /* SPROM WRITE enable. */

	bcm43xx_pci_write_config32(bcm, BCM43xx_PCICFG_SPROMCTL, spromctl);

	err = bcm43xx_pci_write_config32(bcm, BCM43xx_PCICFG_SPROMCTL, spromctl);

	if (err)

		goto err_ctlreg;

	/* We must burn lots of CPU cycles here, but that does not
@@ -768,7 +768,7 @@ int bcm43xx_sprom_write(struct bcm43xx_private *bcm, const u16 *sprom) 
		mdelay(20);

	}

	spromctl &= ~0x10; /* SPROM WRITE enable. */

	bcm43xx_pci_write_config32(bcm, BCM43xx_PCICFG_SPROMCTL, spromctl);

	err = bcm43xx_pci_write_config32(bcm, BCM43xx_PCICFG_SPROMCTL, spromctl);

	if (err)

		goto err_ctlreg;

	mdelay(500);