diff options
| author | Jonathan Cameron <jic23@cam.ac.uk> | 2010-07-11 16:39:08 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-22 11:38:27 -0700 |
| commit | 3c9bbf58b2a7e9099343d36a2c0b206f8c2450df (patch) | |
| tree | 19247eebf1b491a86d9c9d64cf123fd70b9dd356 /drivers/staging/iio/trigger/iio-trig-gpio.c | |
| parent | cb46f472cbb08c44ae47a5bea80207c4e4407ee3 (diff) | |
staging: iio: Use kasprintf to allocate and fill trig->name
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/trigger/iio-trig-gpio.c')
| -rw-r--r-- | drivers/staging/iio/trigger/iio-trig-gpio.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/iio/trigger/iio-trig-gpio.c b/drivers/staging/iio/trigger/iio-trig-gpio.c index 1da285d28632..3c0614eff72c 100644 --- a/drivers/staging/iio/trigger/iio-trig-gpio.c +++ b/drivers/staging/iio/trigger/iio-trig-gpio.c @@ -93,16 +93,11 @@ static int iio_gpio_trigger_probe(struct platform_device *pdev) trig->private_data = trig_info; trig_info->irq = irq; trig->owner = THIS_MODULE; - trig->name = kmalloc(IIO_TRIGGER_NAME_LENGTH, - GFP_KERNEL); - if (!trig->name) { + trig->name = kasprintf(GFP_KERNEL, "irqtrig%d", irq); + if (trig->name == NULL) { ret = -ENOMEM; goto error_free_trig_info; } - snprintf((char *)trig->name, - IIO_TRIGGER_NAME_LENGTH, - "irqtrig%d", irq); - ret = request_irq(irq, iio_gpio_trigger_poll, irqflags, trig->name, trig); if (ret) { |