diff options
-rw-r--r-- | drivers/net/wireless/orinoco/orinoco_cs.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c index bf6a51da3b29..f127602670ec 100644 --- a/drivers/net/wireless/orinoco/orinoco_cs.c +++ b/drivers/net/wireless/orinoco/orinoco_cs.c | |||
@@ -178,13 +178,17 @@ static int orinoco_cs_config_check(struct pcmcia_device *p_dev, | |||
178 | /* Note that the CIS values need to be rescaled */ | 178 | /* Note that the CIS values need to be rescaled */ |
179 | if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) { | 179 | if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) { |
180 | if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) { | 180 | if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) { |
181 | DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n", vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000); | 181 | DEBUG(2, "%s: Vcc mismatch (vcc = %d, CIS = %d)\n", |
182 | __func__, vcc, | ||
183 | cfg->vcc.param[CISTPL_POWER_VNOM] / 10000); | ||
182 | if (!ignore_cis_vcc) | 184 | if (!ignore_cis_vcc) |
183 | goto next_entry; | 185 | goto next_entry; |
184 | } | 186 | } |
185 | } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) { | 187 | } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) { |
186 | if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000) { | 188 | if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000) { |
187 | DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n", vcc, dflt->vcc.param[CISTPL_POWER_VNOM] / 10000); | 189 | DEBUG(2, "%s: Vcc mismatch (vcc = %d, CIS = %d)\n", |
190 | __func__, vcc, | ||
191 | dflt->vcc.param[CISTPL_POWER_VNOM] / 10000); | ||
188 | if (!ignore_cis_vcc) | 192 | if (!ignore_cis_vcc) |
189 | goto next_entry; | 193 | goto next_entry; |
190 | } | 194 | } |