Re: [PATCH v2 08/12] staging:iio: Fix iio_utils.h function prototypes

[Jonathan Cameron <jic23@xxxxxxxxxx>]

On 12/06/14 06:00, Peter Meerwald wrote:
> Signed-off-by: Peter Meerwald <pmeerw@xxxxxxxxxx>
Applied to the togreg branch of iio.git

Thanks
> ---
>   drivers/staging/iio/Documentation/iio_utils.h | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/iio/Documentation/iio_utils.h b/drivers/staging/iio/Documentation/iio_utils.h
> index a9cfc06..0973a09 100644
> --- a/drivers/staging/iio/Documentation/iio_utils.h
> +++ b/drivers/staging/iio/Documentation/iio_utils.h
> @@ -633,7 +633,7 @@ error_free:
>
>   int read_sysfs_float(char *filename, char *basedir, float *val)
>   {
> -	float ret = 0;
> +	int ret = 0;
>   	FILE  *sysfsfp;
>   	char *temp = malloc(strlen(basedir) + strlen(filename) + 2);
>   	if (temp == NULL) {
> @@ -653,9 +653,9 @@ error_free:
>   	return ret;
>   }
>
> -read_sysfs_string(const char *filename, const char *basedir, char *str)
> +int read_sysfs_string(const char *filename, const char *basedir, char *str)
>   {
> -	float ret = 0;
> +	int ret = 0;
>   	FILE  *sysfsfp;
>   	char *temp = malloc(strlen(basedir) + strlen(filename) + 2);
>   	if (temp == NULL) {

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html