@@ -471,33 +471,33 @@ mwifiex_regrdwr_read(struct file *file, char __user *ubuf,
if (!saved_reg_type) {
/* No command has been given */
- pos += snprintf(buf, PAGE_SIZE, "0");
goto done;
}
- /* Set command has been given */
+
if (saved_reg_value != UINT_MAX) {
- ret = mwifiex_reg_write(priv, saved_reg_type, saved_reg_offset,
- saved_reg_value);
+ /* Set command has been given */
+ mwifiex_reg_write(priv, saved_reg_type, saved_reg_offset,
+ saved_reg_value);
pos += snprintf(buf, PAGE_SIZE, "%u 0x%x 0x%x\n",
saved_reg_type, saved_reg_offset,
saved_reg_value);
- ret = simple_read_from_buffer(ubuf, count, ppos, buf, pos);
+ } else {
+ /* Get command has been given */
+ ret = mwifiex_reg_read(priv, saved_reg_type,
+ saved_reg_offset, ®_value);
- goto done;
- }
- /* Get command has been given */
- ret = mwifiex_reg_read(priv, saved_reg_type,
- saved_reg_offset, ®_value);
- if (ret) {
- ret = -EINVAL;
- goto done;
+ if (ret) {
+ ret = -EINVAL;
+ goto done;
+ } else {
+ pos += snprintf(buf, PAGE_SIZE, "%u 0x%x 0x%x\n",
+ saved_reg_type, saved_reg_offset,
+ reg_value);
+ }
}
- pos += snprintf(buf, PAGE_SIZE, "%u 0x%x 0x%x\n", saved_reg_type,
- saved_reg_offset, reg_value);
-
ret = simple_read_from_buffer(ubuf, count, ppos, buf, pos);
done:
Signed-off-by: Milan Lakhani <milan.lakhani@codethink.co.uk> --- .../net/wireless/marvell/mwifiex/debugfs.c | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-)