From 3f152aec19182cb5d350e3dd76958f3a36dcfdd6 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Thu, 29 Jul 2010 13:58:48 -0400 Subject: [PATCH] --- yaml --- r: 213955 b: refs/heads/master c: 68e887ef21dfd9adcf896ef92a9676bf9036a0aa h: refs/heads/master i: 213953: a837f2cd1d0995bca10bb248f6cfc011bf9e5b42 213951: 5c12cf696494032c0473b4bf2b243dce8c6d7b50 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/zd1211rw/zd_chip.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index af0381a79dc5..b6bbcfd065be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd358c9a45fc27f90e77992cf77117ab6e2fb467 +refs/heads/master: 68e887ef21dfd9adcf896ef92a9676bf9036a0aa diff --git a/trunk/drivers/net/wireless/zd1211rw/zd_chip.c b/trunk/drivers/net/wireless/zd1211rw/zd_chip.c index b2af3c549bb3..87a95bcfee57 100644 --- a/trunk/drivers/net/wireless/zd1211rw/zd_chip.c +++ b/trunk/drivers/net/wireless/zd1211rw/zd_chip.c @@ -973,6 +973,7 @@ static void dump_fw_registers(struct zd_chip *chip) static int print_fw_version(struct zd_chip *chip) { + struct wiphy *wiphy = zd_chip_to_mac(chip)->hw->wiphy; int r; u16 version; @@ -982,6 +983,10 @@ static int print_fw_version(struct zd_chip *chip) return r; dev_info(zd_chip_dev(chip),"firmware version %04hx\n", version); + + snprintf(wiphy->fw_version, sizeof(wiphy->fw_version), + "%04hx", version); + return 0; }