On 11/06/2011 09:49 PM, Jesper Juhl wrote: > If ad7280_read_all_channels() returns <0 then we'll leak the memory > allocated to 'channels' when we return and that variable goes out of > scope. > This patch fixes the leak. > Looks right to me - good spot. Only choice is whether a single exit point makes sense rather than undwinding it here? Michael? I'm happy with either solution, hence the ack.
> Signed-off-by: Jesper Juhl <[email protected]> Acked-by: Jonathan Cameron <[email protected]> > --- > drivers/staging/iio/adc/ad7280a.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > note: I don't have the hardware, so patch is compile tested only. > > diff --git a/drivers/staging/iio/adc/ad7280a.c > b/drivers/staging/iio/adc/ad7280a.c > index 372d059..dddc03c 100644 > --- a/drivers/staging/iio/adc/ad7280a.c > +++ b/drivers/staging/iio/adc/ad7280a.c > @@ -687,8 +687,10 @@ static irqreturn_t ad7280_event_handler(int irq, void > *private) > return IRQ_HANDLED; > > ret = ad7280_read_all_channels(st, st->scan_cnt, channels); > - if (ret < 0) > + if (ret < 0) { > + kfree(channels); > return IRQ_HANDLED; > + } > > for (i = 0; i < st->scan_cnt; i++) { > if (((channels[i] >> 23) & 0xF) <= AD7280A_CELL_VOLTAGE_6) { _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
