Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc6ed2c6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fixes-togreg-3.6a' of... 

Merge tag 'fixes-togreg-3.6a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into work-next

Various minor IIO fixes for staging-next.
parents d99b5ac6 e59b9afe

drivers/iio/dac/ad5064.c

+20 −20
Original line number Diff line number Diff line
@@ -122,25 +122,6 @@ enum ad5064_type { 
	ID_AD5668_2,

};



static int ad5064_i2c_write(struct ad5064_state *st, unsigned int cmd,

	unsigned int addr, unsigned int val)

{

	struct i2c_client *i2c = to_i2c_client(st->dev);



	st->data.i2c[0] = (cmd << 4) | addr;

	put_unaligned_be16(val, &st->data.i2c[1]);

	return i2c_master_send(i2c, st->data.i2c, 3);

}



static int ad5064_spi_write(struct ad5064_state *st, unsigned int cmd,

	unsigned int addr, unsigned int val)

{

	struct spi_device *spi = to_spi_device(st->dev);



	st->data.spi = cpu_to_be32(AD5064_CMD(cmd) | AD5064_ADDR(addr) | val);

	return spi_write(spi, &st->data.spi, sizeof(st->data.spi));

}



static int ad5064_write(struct ad5064_state *st, unsigned int cmd,

	unsigned int addr, unsigned int val, unsigned int shift)

{
@@ -533,6 +514,15 @@ static int __devexit ad5064_remove(struct device *dev) 


#if IS_ENABLED(CONFIG_SPI_MASTER)



static int ad5064_spi_write(struct ad5064_state *st, unsigned int cmd,

	unsigned int addr, unsigned int val)

{

	struct spi_device *spi = to_spi_device(st->dev);



	st->data.spi = cpu_to_be32(AD5064_CMD(cmd) | AD5064_ADDR(addr) | val);

	return spi_write(spi, &st->data.spi, sizeof(st->data.spi));

}



static int __devinit ad5064_spi_probe(struct spi_device *spi)

{

	const struct spi_device_id *id = spi_get_device_id(spi);
@@ -582,7 +572,7 @@ static int __init ad5064_spi_register_driver(void) 
	return spi_register_driver(&ad5064_spi_driver);

}



static void __exit ad5064_spi_unregister_driver(void)

static void ad5064_spi_unregister_driver(void)

{

	spi_unregister_driver(&ad5064_spi_driver);

}
@@ -596,6 +586,16 @@ static inline void ad5064_spi_unregister_driver(void) { } 


#if IS_ENABLED(CONFIG_I2C)



static int ad5064_i2c_write(struct ad5064_state *st, unsigned int cmd,

	unsigned int addr, unsigned int val)

{

	struct i2c_client *i2c = to_i2c_client(st->dev);



	st->data.i2c[0] = (cmd << 4) | addr;

	put_unaligned_be16(val, &st->data.i2c[1]);

	return i2c_master_send(i2c, st->data.i2c, 3);

}



static int __devinit ad5064_i2c_probe(struct i2c_client *i2c,

	const struct i2c_device_id *id)

{

drivers/iio/inkern.c

+2 −1
Original line number Diff line number Diff line
@@ -198,11 +198,12 @@ struct iio_channel *iio_channel_get_all(const char *name) 
		iio_device_get(chans[mapind].indio_dev);

		mapind++;

	}

	mutex_unlock(&iio_map_list_lock);

	if (mapind == 0) {

		ret = -ENODEV;

		goto error_free_chans;

	}

	mutex_unlock(&iio_map_list_lock);



	return chans;



error_free_chans:

drivers/staging/iio/adc/max1363_ring.c

+3 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static irqreturn_t max1363_trigger_handler(int irq, void *p) 
	else

		b_sent = i2c_master_recv(st->client, rxbuf, numvals);

	if (b_sent < 0)

		goto done;

		goto done_free;



	time_ns = iio_get_time_ns();
@@ -82,9 +82,10 @@ static irqreturn_t max1363_trigger_handler(int irq, void *p) 
		memcpy(rxbuf + d_size - sizeof(s64), &time_ns, sizeof(time_ns));

	iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns);



done_free:

	kfree(rxbuf);

done:

	iio_trigger_notify_done(indio_dev->trig);

	kfree(rxbuf);



	return IRQ_HANDLED;

}