libertas: always show firmware release

Always shows the firmware release.

Also converts the firmware release into something that is easily comparable.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 11 deletions

diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index 3e8d555ba3a9..e8bfc26b10a4 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -2071,17 +2071,11 @@ void lbs_get_fwversion(struct lbs_private *priv, char *fwversion, int maxlen)
 
         mutex_lock(&priv->lock);
 
-        if (priv->fwreleasenumber[3] == 0)
-                sprintf(fwver, "%u.%u.%u",
-                        priv->fwreleasenumber[2],
-                        priv->fwreleasenumber[1],
-                        priv->fwreleasenumber[0]);
-        else
-                sprintf(fwver, "%u.%u.%u.p%u",
-                        priv->fwreleasenumber[2],
-                        priv->fwreleasenumber[1],
-                        priv->fwreleasenumber[0],
-                        priv->fwreleasenumber[3]);
+        sprintf(fwver, "%u.%u.%u.p%u",
+                priv->fwrelease >> 24 & 0xff,
+                priv->fwrelease >> 16 & 0xff,
+                priv->fwrelease >>  8 & 0xff,
+                priv->fwrelease       & 0xff);
 
         mutex_unlock(&priv->lock);
         snprintf(fwversion, maxlen, fwver);