Commit 5265b267 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jonathan Cameron
Browse files

iio: accel: bma220: Fix returned codes from bma220_init(), bma220_deinit() 



Potentially bma220_init() and bma220_deinit() may return positive codes.
Fix the logic to return proper error codes instead.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200831090813.78841-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 8d7eab62

drivers/iio/accel/bma220_spi.c

+9 −5
Original line number Diff line number Diff line
@@ -198,10 +198,12 @@ static int bma220_init(struct spi_device *spi) 


	/* Make sure the chip is powered on */

	ret = bma220_read_reg(spi, BMA220_REG_SUSPEND);

	if (ret == BMA220_SUSPEND_WAKE)

		ret = bma220_read_reg(spi, BMA220_REG_SUSPEND);

	if (ret < 0)

		return ret;

	else if (ret == BMA220_SUSPEND_WAKE)

		return bma220_read_reg(spi, BMA220_REG_SUSPEND);

	if (ret == BMA220_SUSPEND_WAKE)

		return -EBUSY;



	return 0;

}
@@ -212,10 +214,12 @@ static int bma220_deinit(struct spi_device *spi) 


	/* Make sure the chip is powered off */

	ret = bma220_read_reg(spi, BMA220_REG_SUSPEND);

	if (ret == BMA220_SUSPEND_SLEEP)

		ret = bma220_read_reg(spi, BMA220_REG_SUSPEND);

	if (ret < 0)

		return ret;

	else if (ret == BMA220_SUSPEND_SLEEP)

		return bma220_read_reg(spi, BMA220_REG_SUSPEND);

	if (ret == BMA220_SUSPEND_SLEEP)

		return -EBUSY;



	return 0;

}
@@ -245,7 +249,7 @@ static int bma220_probe(struct spi_device *spi) 
	indio_dev->available_scan_masks = bma220_accel_scan_masks;



	ret = bma220_init(data->spi_device);

	if (ret < 0)

	if (ret)

		return ret;



	ret = iio_triggered_buffer_setup(indio_dev, iio_pollfunc_store_time,

CRA Git | Maintained and supported by SUSTech CRA and CCSE