Merge 3.7-rc3 into staging-next

[deliverable/linux.git] / drivers / staging / iio / accel / adis16201_core.c

diff --git a/drivers/staging/iio/accel/adis16201_core.c b/drivers/staging/iio/accel/adis16201_core.c
index b12ca68cd9e4f286191349ba148aabcf3b9d6e56..d2a203a583afe6360dbbd2ea434d16edbf8fbe96 100644 (file)
--- a/drivers/staging/iio/accel/adis16201_core.c
+++ b/drivers/staging/iio/accel/adis16201_core.c
@@ -347,7 +347,7 @@ static int adis16201_read_raw(struct iio_dev *indio_dev,
                        break;
                default:
                        return -EINVAL;
-               };
+               }
                mutex_lock(&indio_dev->mlock);
                addr = adis16201_addresses[chan->address][1];
                ret = adis16201_spi_read_reg_16(indio_dev, addr, &val16);
@@ -384,7 +384,7 @@ static int adis16201_write_raw(struct iio_dev *indio_dev,
                        break;
                default:
                        return -EINVAL;
-               };
+               }
                val16 = val & ((1 << bits) - 1);
                addr = adis16201_addresses[chan->address][1];
                return adis16201_spi_write_reg_16(indio_dev, addr, val16);