diff options
| author | Luca Ellero <luca.ellero@brickedbrain.com> | 2014-07-10 11:02:19 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-10 15:09:26 -0700 |
| commit | 347ee20b4081e658ff888872e3189ac0ba9d2edd (patch) | |
| tree | 28772c844eb4f91fbd70a2266c00bd5f7078dbe2 /drivers/staging/ced1401 | |
| parent | 7692320c08a2f4ea255a2ab9cff66d7786f2a76d (diff) | |
| download | op-kernel-dev-347ee20b4081e658ff888872e3189ac0ba9d2edd.zip op-kernel-dev-347ee20b4081e658ff888872e3189ac0ba9d2edd.tar.gz | |
staging: ced1401: fix ced_get_out_buf_space()
Rename camel case arguments and locals in function ced_get_out_buf_space()
Signed-off-by: Luca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ced1401')
| -rw-r--r-- | drivers/staging/ced1401/ced_ioc.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/staging/ced1401/ced_ioc.c b/drivers/staging/ced1401/ced_ioc.c index d7645c4..3f8bf6d 100644 --- a/drivers/staging/ced1401/ced_ioc.c +++ b/drivers/staging/ced1401/ced_ioc.c @@ -585,13 +585,19 @@ int ced_line_count(struct ced_data *ced) *****************************************************************************/ int ced_get_out_buf_space(struct ced_data *ced) { - int iReturn; + int ret; + mutex_lock(&ced->io_mutex); /* Protect disconnect from new i/o */ + ced_send_chars(ced); /* send any buffered chars */ - iReturn = (int)(OUTBUF_SZ - ced->num_output); /* no lock needed for single read */ - dev_dbg(&ced->interface->dev, "%s: %d\n", __func__, iReturn); + + /* no lock needed for single read */ + ret = (int)(OUTBUF_SZ - ced->num_output); + + dev_dbg(&ced->interface->dev, "%s: %d\n", __func__, ret); + mutex_unlock(&ced->io_mutex); /* Protect disconnect from new i/o */ - return iReturn; + return ret; } /**************************************************************************** |
