1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/net/wireless/orinoco/scan.c b/drivers/net/wireless/orinoco/scan.c
index 86cb54c842e..e99ca1c1e0d 100644
--- a/drivers/net/wireless/orinoco/scan.c
+++ b/drivers/net/wireless/orinoco/scan.c
@@ -111,6 +111,11 @@ static void orinoco_add_hostscan_result(struct orinoco_private *priv,
 
         freq = ieee80211_dsss_chan_to_freq(le16_to_cpu(bss->a.channel));
         channel = ieee80211_get_channel(wiphy, freq);
+        if (!channel) {
+                printk(KERN_DEBUG "Invalid channel designation %04X(%04X)",
+                        bss->a.channel, freq);
+                return; /* Then ignore it for now */
+        }
         timestamp = 0;
         capability = le16_to_cpu(bss->a.capabilities);
         beacon_interval = le16_to_cpu(bss->a.beacon_interv);