From 3ac93d6897976be9ceb1645b246d62666a7729b9 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Tue, 11 Dec 2012 00:06:41 +0100 Subject: [PATCH] --- yaml --- r: 342119 b: refs/heads/master c: 36b07d15a656b657beaf9e6357a341768192fad2 h: refs/heads/master i: 342117: c1b45e5ffd40d33f6fe5962ccdfd41fd4f717930 342115: 23560840cbb7b46e55324826472d133bc0dd530a 342111: daff62b286616bd5882e442e70ff5e6082181a64 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ebb71ae1ae70..0f4665f1ee86 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e576defd1fe1ade5afe590eadd556dce5473fc26 +refs/heads/master: 36b07d15a656b657beaf9e6357a341768192fad2 diff --git a/trunk/drivers/net/wireless/ath/ath9k/init.c b/trunk/drivers/net/wireless/ath/ath9k/init.c index 27703a5e48d6..f69ef5d48c7b 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/init.c +++ b/trunk/drivers/net/wireless/ath/ath9k/init.c @@ -633,7 +633,7 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, ath_read_cachesize(common, &csz); common->cachelsz = csz << 2; /* convert to bytes */ - if (pdata->eeprom_name) { + if (pdata && pdata->eeprom_name) { ret = ath9k_eeprom_request(sc, pdata->eeprom_name); if (ret) goto err_eeprom;