From 0260f683e5083219894d217b1d1ecaa630f8b735 Mon Sep 17 00:00:00 2001 From: Holger Schurig Date: Tue, 29 Apr 2008 10:07:56 +0200 Subject: [PATCH] --- yaml --- r: 95871 b: refs/heads/master c: c0d43990768b6ca83604ff4be80425b89d317e2f h: refs/heads/master i: 95869: 3f27ed15ffd54d7262b9a4ae34f397149e598396 95867: 8e2b3c69332db2b539137059abaae95e06410ffe 95863: b6ea76183373cc6e1aa8465f4451986deb2c3191 95855: 0d493b5387d6b1d5a81b25adc7a569f600b0a99c 95839: 8f7cb11da233efb9e639cc13fd08e1aa708b4c4c 95807: aecad7cfd20b4d290b6b1269b7c8c4019b2a4841 95743: d7dfffab0cb0b2509279ad7a6225a5971bd1b718 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/scan.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5f0bf630804c..cd992510d462 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e35af143a1380173ba292e48e9b4913ef16b4ee +refs/heads/master: c0d43990768b6ca83604ff4be80425b89d317e2f diff --git a/trunk/drivers/net/wireless/libertas/scan.c b/trunk/drivers/net/wireless/libertas/scan.c index e72c97a0d6c1..7234669d05c0 100644 --- a/trunk/drivers/net/wireless/libertas/scan.c +++ b/trunk/drivers/net/wireless/libertas/scan.c @@ -298,7 +298,8 @@ static int lbs_do_scan(struct lbs_private *priv, uint8_t bsstype, uint8_t *tlv; /* pointer into our current, growing TLV storage area */ lbs_deb_enter_args(LBS_DEB_SCAN, "bsstype %d, chanlist[].chan %d, chan_count %d", - bsstype, chan_list[0].channumber, chan_count); + bsstype, chan_list ? chan_list[0].channumber : -1, + chan_count); /* create the fixed part for scan command */ scan_cmd = kzalloc(MAX_SCAN_CFG_ALLOC, GFP_KERNEL);