diff options
| author | Bartosz Markowski <bartosz.markowski@tieto.com> | 2012-02-29 15:15:32 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:06:49 +0200 |
| commit | d1ca211045ac275be0351dcdd5fd5677f20af9ab (patch) | |
| tree | f1914beb9ebea797eb8d2a2dbf034788d8ec0be3 | |
| parent | e9ae53167bf730792813618295e2f5654ee0d91c (diff) | |
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 <bartosz.markowski@tieto.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/47989
| -rw-r--r-- | drivers/staging/cw1200/debug.c | 18 |
1 files 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); } |