| Message ID | 1532358123-23485-2-git-send-email-manish.narani@xilinx.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iio: adc: xilinx: XADC driver Enhancements and bug fixes | expand |
On Mon, 23 Jul 2018 20:32:00 +0530 Manish Narani <manish.narani@xilinx.com> wrote: > This patch adds check for return values from clock related functions. > This was reported by static code analysis tool. > > Signed-off-by: Manish Narani <manish.narani@xilinx.com> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > --- > drivers/iio/adc/xilinx-xadc-core.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c > index 0127e85..23395fc 100644 > --- a/drivers/iio/adc/xilinx-xadc-core.c > +++ b/drivers/iio/adc/xilinx-xadc-core.c > @@ -340,6 +340,8 @@ static int xadc_zynq_setup(struct platform_device *pdev, > xadc->zynq_intmask = ~0; > > pcap_rate = clk_get_rate(xadc->clk); > + if (!pcap_rate) > + return -EINVAL; > > if (tck_rate > pcap_rate / 2) { > div = 2; > @@ -887,6 +889,9 @@ static int xadc_write_raw(struct iio_dev *indio_dev, > unsigned long clk_rate = xadc_get_dclk_rate(xadc); > unsigned int div; > > + if (!clk_rate) > + return -EINVAL; > + > if (info != IIO_CHAN_INFO_SAMP_FREQ) > return -EINVAL; > > @@ -1237,8 +1242,10 @@ static int xadc_probe(struct platform_device *pdev) > goto err_free_irq; > > /* Disable all alarms */ > - xadc_update_adc_reg(xadc, XADC_REG_CONF1, XADC_CONF1_ALARM_MASK, > - XADC_CONF1_ALARM_MASK); > + ret = xadc_update_adc_reg(xadc, XADC_REG_CONF1, XADC_CONF1_ALARM_MASK, > + XADC_CONF1_ALARM_MASK); > + if (ret) > + goto err_free_irq; > > /* Set thresholds to min/max */ > for (i = 0; i < 16; i++) {
diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c index 0127e85..23395fc 100644 --- a/drivers/iio/adc/xilinx-xadc-core.c +++ b/drivers/iio/adc/xilinx-xadc-core.c @@ -340,6 +340,8 @@ static int xadc_zynq_setup(struct platform_device *pdev, xadc->zynq_intmask = ~0; pcap_rate = clk_get_rate(xadc->clk); + if (!pcap_rate) + return -EINVAL; if (tck_rate > pcap_rate / 2) { div = 2; @@ -887,6 +889,9 @@ static int xadc_write_raw(struct iio_dev *indio_dev, unsigned long clk_rate = xadc_get_dclk_rate(xadc); unsigned int div; + if (!clk_rate) + return -EINVAL; + if (info != IIO_CHAN_INFO_SAMP_FREQ) return -EINVAL; @@ -1237,8 +1242,10 @@ static int xadc_probe(struct platform_device *pdev) goto err_free_irq; /* Disable all alarms */ - xadc_update_adc_reg(xadc, XADC_REG_CONF1, XADC_CONF1_ALARM_MASK, - XADC_CONF1_ALARM_MASK); + ret = xadc_update_adc_reg(xadc, XADC_REG_CONF1, XADC_CONF1_ALARM_MASK, + XADC_CONF1_ALARM_MASK); + if (ret) + goto err_free_irq; /* Set thresholds to min/max */ for (i = 0; i < 16; i++) {
This patch adds check for return values from clock related functions. This was reported by static code analysis tool. Signed-off-by: Manish Narani <manish.narani@xilinx.com> --- drivers/iio/adc/xilinx-xadc-core.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)