From 8832a9d097171ba41ff68052cde5ba84713427d2 Mon Sep 17 00:00:00 2001 From: David Kilroy Date: Tue, 9 Dec 2008 21:46:28 +0000 Subject: [PATCH] --- yaml --- r: 122671 b: refs/heads/master c: 0c06dd8a237c673eedd295fbef7a8c0e52f5c045 h: refs/heads/master i: 122669: b768865f347bf866ebdf42b6bf310c7e369eddc5 122667: 847da3d33f0d1f028dc40168884ace12af2ccc82 122663: 5cd1934ee9d2afeb4567e36ff22ab7df3b9fe516 122655: f76f47c14f4b732599e470ad9892e65c12d972e1 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/orinoco/orinoco_cs.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7ae1bcb16afa..5623ab08b3be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39ca5bb76f3382b1cb0062d75ec45abd1c46e6d2 +refs/heads/master: 0c06dd8a237c673eedd295fbef7a8c0e52f5c045 diff --git a/trunk/drivers/net/wireless/orinoco/orinoco_cs.c b/trunk/drivers/net/wireless/orinoco/orinoco_cs.c index bf6a51da3b29..f127602670ec 100644 --- a/trunk/drivers/net/wireless/orinoco/orinoco_cs.c +++ b/trunk/drivers/net/wireless/orinoco/orinoco_cs.c @@ -178,13 +178,17 @@ static int orinoco_cs_config_check(struct pcmcia_device *p_dev, /* Note that the CIS values need to be rescaled */ if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) { if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) { - DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n", vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000); + DEBUG(2, "%s: Vcc mismatch (vcc = %d, CIS = %d)\n", + __func__, 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 (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000) { - DEBUG(2, "spectrum_cs_config: Vcc mismatch (vcc = %d, CIS = %d)\n", vcc, dflt->vcc.param[CISTPL_POWER_VNOM] / 10000); + DEBUG(2, "%s: Vcc mismatch (vcc = %d, CIS = %d)\n", + __func__, vcc, + dflt->vcc.param[CISTPL_POWER_VNOM] / 10000); if (!ignore_cis_vcc) goto next_entry; }