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

Commit 4f95af5b authored by Valdis Kletnieks's avatar Valdis Kletnieks Committed by John W. Linville
Browse files

[PATCH] orinoco_cs: tweak Vcc debugging messages 



The current orinoco_cs.c can issue the exact same error message for
2 different tests that can fail.  Alter them so we can tell which
one of the two failed.

Signed-off-by: default avatarValdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3ee68c4a

drivers/net/wireless/orinoco_cs.c

+2 −2
Original line number Diff line number Diff line
@@ -261,13 +261,13 @@ orinoco_cs_config(dev_link_t *link) 
		/* Note that the CIS values need to be rescaled */

		if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {

			if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {

				DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n",  conf.Vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);

				DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, cfg CIS = %d)\n",  conf.Vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);

				if (!ignore_cis_vcc)

					goto next_entry;

			}

		} else if (dflt.vcc.present & (1 << CISTPL_POWER_VNOM)) {

			if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] / 10000) {

				DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n",  conf.Vcc, dflt.vcc.param[CISTPL_POWER_VNOM] / 10000);

				DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, dflt CIS = %d)\n",  conf.Vcc, dflt.vcc.param[CISTPL_POWER_VNOM] / 10000);

				if(!ignore_cis_vcc)

					goto next_entry;

			}