From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D205DC43613 for ; Sat, 22 Jun 2019 08:28:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7D632089E for ; Sat, 22 Jun 2019 08:28:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726187AbfFVI2l (ORCPT ); Sat, 22 Jun 2019 04:28:41 -0400 Received: from saturn.retrosnub.co.uk ([46.235.226.198]:50022 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726100AbfFVI2l (ORCPT ); Sat, 22 Jun 2019 04:28:41 -0400 Received: from archlinux (cpc149474-cmbg20-2-0-cust94.5-4.cable.virginm.net [82.4.196.95]) by saturn.retrosnub.co.uk (Postfix; Retrosnub mail submission) with ESMTPSA id EA9D69E7B57; Sat, 22 Jun 2019 09:28:38 +0100 (BST) Date: Sat, 22 Jun 2019 09:28:31 +0100 From: Jonathan Cameron To: Denis CIOCCA Cc: Alexandru Ardelean , "linux-iio@vger.kernel.org" Subject: Re: [PATCH][V3] iio: st_accel: fix iio_triggered_buffer_{pre,post}enable positions Message-ID: <20190622092831.2df4e7cb@archlinux> In-Reply-To: <0420c90b027249eb9dd28bd9e266088a@SFHDAG2NODE1.st.com> References: <20190529135848.11964-1-alexandru.ardelean@analog.com> <20190614104725.4535-1-alexandru.ardelean@analog.com> <0420c90b027249eb9dd28bd9e266088a@SFHDAG2NODE1.st.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org On Mon, 17 Jun 2019 22:12:02 +0000 Denis CIOCCA wrote: > Hi Alexandru, > > Looks good to me. > > Acked-by: Denis Ciocca Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > > Thanks, > Denis > > > -----Original Message----- > From: linux-iio-owner@vger.kernel.org On Behalf Of Alexandru Ardelean > Sent: Friday, June 14, 2019 3:47 AM > To: linux-iio@vger.kernel.org > Cc: Alexandru Ardelean > Subject: [PATCH][V3] iio: st_accel: fix iio_triggered_buffer_{pre,post}enable positions > > The iio_triggered_buffer_{predisable,postenable} functions attach/detach the poll functions. > > For the predisable hook, the disable code should occur before detaching the poll func, and for the postenable hook, the poll func should be attached before the enable code. > > Signed-off-by: Alexandru Ardelean > --- > > Changelog v1 -> v2: > * record the first error in st_accel_buffer_predisable() and return that > > Changelog v2 -> v3: > * move iio_triggered_buffer_postenable() after the allocation, but before > `st_sensors_set_axis_enable()` based on comment from > `Denis Ciocca ` > > drivers/iio/accel/st_accel_buffer.c | 22 +++++++++++++--------- > 1 file changed, 13 insertions(+), 9 deletions(-) > > diff --git a/drivers/iio/accel/st_accel_buffer.c b/drivers/iio/accel/st_accel_buffer.c > index 7fddc137e91e..802ab7d2d93f 100644 > --- a/drivers/iio/accel/st_accel_buffer.c > +++ b/drivers/iio/accel/st_accel_buffer.c > @@ -46,17 +46,19 @@ static int st_accel_buffer_postenable(struct iio_dev *indio_dev) > goto allocate_memory_error; > } > > - err = st_sensors_set_axis_enable(indio_dev, > - (u8)indio_dev->active_scan_mask[0]); > + err = iio_triggered_buffer_postenable(indio_dev); > if (err < 0) > goto st_accel_buffer_postenable_error; > > - err = iio_triggered_buffer_postenable(indio_dev); > + err = st_sensors_set_axis_enable(indio_dev, > + (u8)indio_dev->active_scan_mask[0]); > if (err < 0) > - goto st_accel_buffer_postenable_error; > + goto st_sensors_set_axis_enable_error; > > return err; > > +st_sensors_set_axis_enable_error: > + iio_triggered_buffer_predisable(indio_dev); > st_accel_buffer_postenable_error: > kfree(adata->buffer_data); > allocate_memory_error: > @@ -65,20 +67,22 @@ static int st_accel_buffer_postenable(struct iio_dev *indio_dev) > > static int st_accel_buffer_predisable(struct iio_dev *indio_dev) { > - int err; > + int err, err2; > struct st_sensor_data *adata = iio_priv(indio_dev); > > - err = iio_triggered_buffer_predisable(indio_dev); > - if (err < 0) > - goto st_accel_buffer_predisable_error; > - > err = st_sensors_set_axis_enable(indio_dev, ST_SENSORS_ENABLE_ALL_AXIS); > if (err < 0) > goto st_accel_buffer_predisable_error; > > err = st_sensors_set_enable(indio_dev, false); > + if (err < 0) > + goto st_accel_buffer_predisable_error; > > st_accel_buffer_predisable_error: > + err2 = iio_triggered_buffer_predisable(indio_dev); > + if (!err) > + err = err2; > + > kfree(adata->buffer_data); > return err; > } > -- > 2.20.1 >