projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'usb-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
[cascardo/linux.git]
/
drivers
/
staging
/
iio
/
meter
/
ade7754.c
diff --git
a/drivers/staging/iio/meter/ade7754.c
b/drivers/staging/iio/meter/ade7754.c
index
1e95068
..
f4188e1
100644
(file)
--- a/
drivers/staging/iio/meter/ade7754.c
+++ b/
drivers/staging/iio/meter/ade7754.c
@@
-347,7
+347,7
@@
static int ade7754_set_irq(struct device *dev, bool enable)
ret = ade7754_spi_read_reg_16(dev, ADE7754_IRQEN, &irqen);
if (ret)
ret = ade7754_spi_read_reg_16(dev, ADE7754_IRQEN, &irqen);
if (ret)
-
goto error_
ret;
+
return
ret;
if (enable)
irqen |= BIT(14); /* Enables an interrupt when a data is
if (enable)
irqen |= BIT(14); /* Enables an interrupt when a data is
@@
-356,10
+356,7
@@
static int ade7754_set_irq(struct device *dev, bool enable)
irqen &= ~BIT(14);
ret = ade7754_spi_write_reg_16(dev, ADE7754_IRQEN, irqen);
irqen &= ~BIT(14);
ret = ade7754_spi_write_reg_16(dev, ADE7754_IRQEN, irqen);
- if (ret)
- goto error_ret;
-error_ret:
return ret;
}
return ret;
}