Skip to content

Commit

Permalink
staging:iio:accel:kxsd9 replace kmallocs in power_up with use of alre…
Browse files Browse the repository at this point in the history
…ady allocated buffer.

Signed-off-by: anish kumar <anish198519851985@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
anish kumar authored and Greg Kroah-Hartman committed Jun 28, 2011
1 parent d561470 commit 3fd47d4
Showing 1 changed file with 9 additions and 29 deletions.
38 changes: 9 additions & 29 deletions drivers/staging/iio/accel/kxsd9.c
Original file line number Diff line number Diff line change
Expand Up @@ -251,52 +251,32 @@ static const struct attribute_group kxsd9_attribute_group = {
.attrs = kxsd9_attributes,
};

static int __devinit kxsd9_power_up(struct spi_device *spi)
static int __devinit kxsd9_power_up(struct kxsd9_state *st)
{
int ret;
struct spi_transfer xfers[2] = {
{
.bits_per_word = 8,
.len = 2,
.cs_change = 1,
.tx_buf = st->tx,
}, {
.bits_per_word = 8,
.len = 2,
.cs_change = 1,
.tx_buf = st->tx + 2,
},
};
struct spi_message msg;
u8 *tx2;
u8 *tx = kmalloc(2, GFP_KERNEL);

if (tx == NULL) {
ret = -ENOMEM;
goto error_ret;
}
tx2 = kmalloc(2, GFP_KERNEL);
if (tx2 == NULL) {
ret = -ENOMEM;
goto error_free_tx;
}
tx[0] = 0x0d;
tx[1] = 0x40;

tx2[0] = 0x0c;
tx2[1] = 0x9b;
st->tx[0] = 0x0d;
st->tx[1] = 0x40;
st->tx[2] = 0x0c;
st->tx[3] = 0x9b;

xfers[0].tx_buf = tx;
xfers[1].tx_buf = tx2;
spi_message_init(&msg);
spi_message_add_tail(&xfers[0], &msg);
spi_message_add_tail(&xfers[1], &msg);
ret = spi_sync(spi, &msg);

kfree(tx2);
error_free_tx:
kfree(tx);
error_ret:
return ret;

return spi_sync(st->us, &msg);
};

static const struct iio_info kxsd9_info = {
Expand Down Expand Up @@ -331,7 +311,7 @@ static int __devinit kxsd9_probe(struct spi_device *spi)

spi->mode = SPI_MODE_0;
spi_setup(spi);
kxsd9_power_up(spi);
kxsd9_power_up(st);

return 0;

Expand Down

0 comments on commit 3fd47d4

Please sign in to comment.