From d1ca211045ac275be0351dcdd5fd5677f20af9ab Mon Sep 17 00:00:00 2001 From: Bartosz Markowski Date: Wed, 29 Feb 2012 15:15:32 +0100 Subject: cw1200: Fix missing debug parts of ITP implementation * cw1200_itp_init missing in cw1200_debug_init * cw1200_itp_release missing in cw1200_debug_release * missing cw1200_print_fw_version definition ST-Ericsson ID: 359166 ST-Ericsson FOSS-OUT ID: NA Change-Id: I82560ec2d3d6214ca9884a1ac4cb5950b6ac9975 Signed-off-by: Bartosz Markowski Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/47989 --- drivers/staging/cw1200/debug.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/staging/cw1200/debug.c b/drivers/staging/cw1200/debug.c index 3a8b79f7556..7a2da551a52 100644 --- a/drivers/staging/cw1200/debug.c +++ b/drivers/staging/cw1200/debug.c @@ -500,13 +500,17 @@ int cw1200_debug_init(struct cw1200_common *priv) goto err; #endif + ret = cw1200_itp_init(priv); + if (ret) + goto err; + return 0; err: priv->debug = NULL; debugfs_remove_recursive(d->debugfs_phy); kfree(d); - return -ENOMEM; + return ret; } void cw1200_debug_release(struct cw1200_common *priv) @@ -517,10 +521,12 @@ void cw1200_debug_release(struct cw1200_common *priv) priv->debug = NULL; kfree(d); } - priv->debug = NULL; - - if (d) { - debugfs_remove_recursive(d->debugfs_phy); - kfree(d); } + +int cw1200_print_fw_version(struct cw1200_common *priv, u8 *buf, size_t len) +{ + return snprintf(buf, len, "%s %d.%d", + cw1200_debug_fw_types[priv->wsm_caps.firmwareType], + priv->wsm_caps.firmwareVersion, + priv->wsm_caps.firmwareBuildNumber); } -- cgit v1.2.3