diff mbox series

[libgpiod,v2] core: fix deselection of output direction when edge detection is selected

Message ID Pine.LNX.4.64.2401021550390.16108@wormhole.robuust.nl
State New
Headers show
Series [libgpiod,v2] core: fix deselection of output direction when edge detection is selected | expand

Commit Message

J.A. Bezemer Jan. 2, 2024, 2:52 p.m. UTC
Fix deselection of output direction when edge detection is selected in
make_kernel_flags(). Use correct flag to perform deselection rather than
a library enum.

For correct usage, there are no visible side-effects. The wrongly reset
kernel flags are always zero already.

For incorrect usage of edge detection combined with output direction,
both output and input directions would have been requested from the
kernel, causing a confusing error. Such usage will now be sanitized, as
intended, into a working configuration with only input direction.

Signed-off-by: Anne Bezemer <j.a.bezemer@opensourcepartners.nl>
---
  lib/line-config.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

Comments

J.A. Bezemer Jan. 3, 2024, 7:17 p.m. UTC | #1
On Wed, 3 Jan 2024, Bartosz Golaszewski wrote:
> On Tue, Jan 2, 2024 at 3:52ÿÿPM J.A. Bezemer
> <j.a.bezemer@opensourcepartners.nl> wrote:
> >
> > Fix deselection of output direction when edge detection is selected in
> > make_kernel_flags(). Use correct flag to perform deselection rather than
> > a library enum.
> >
> > For correct usage, there are no visible side-effects. The wrongly reset
> > kernel flags are always zero already.
> >
> > For incorrect usage of edge detection combined with output direction,
> > both output and input directions would have been requested from the
> > kernel, causing a confusing error. Such usage will now be sanitized, as
> > intended, into a working configuration with only input direction.
> >
> > Signed-off-by: Anne Bezemer <j.a.bezemer@opensourcepartners.nl>
> > ---
> >   lib/line-config.c | 6 +++---
> >   1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/lib/line-config.c b/lib/line-config.c
> > index 2749a2a..9bf7734 100644
> > --- a/lib/line-config.c
> > +++ b/lib/line-config.c
> > @@ -381,18 +381,18 @@ static uint64_t make_kernel_flags(struct gpiod_line_settings *settings)
> >         case GPIOD_LINE_EDGE_FALLING:
> >                 flags |= (GPIO_V2_LINE_FLAG_EDGE_FALLING |
> >                           GPIO_V2_LINE_FLAG_INPUT);
> > -               flags &= ~GPIOD_LINE_DIRECTION_OUTPUT;
> > +               flags &= ~GPIO_V2_LINE_FLAG_OUTPUT;
> >                 break;
> >         case GPIOD_LINE_EDGE_RISING:
> >                 flags |= (GPIO_V2_LINE_FLAG_EDGE_RISING |
> >                           GPIO_V2_LINE_FLAG_INPUT);
> > -               flags &= ~GPIOD_LINE_DIRECTION_OUTPUT;
> > +               flags &= ~GPIO_V2_LINE_FLAG_OUTPUT;
> >                 break;
> >         case GPIOD_LINE_EDGE_BOTH:
> >                 flags |= (GPIO_V2_LINE_FLAG_EDGE_FALLING |
> >                           GPIO_V2_LINE_FLAG_EDGE_RISING |
> >                           GPIO_V2_LINE_FLAG_INPUT);
> > -               flags &= ~GPIOD_LINE_DIRECTION_OUTPUT;
> > +               flags &= ~GPIO_V2_LINE_FLAG_OUTPUT;
> >                 break;
> >         default:
> >                 break;
> > --
> > 2.30.2
> >
> >
> 
> This does not apply on top of current master, could you please verify?
> 
> Bart

Some weird whitespace mangling. Retrying a different way...

Thanks,
Anne Bezemer
diff mbox series

Patch

diff --git a/lib/line-config.c b/lib/line-config.c
index 2749a2a..9bf7734 100644
--- a/lib/line-config.c
+++ b/lib/line-config.c
@@ -381,18 +381,18 @@  static uint64_t make_kernel_flags(struct gpiod_line_settings *settings)
  	case GPIOD_LINE_EDGE_FALLING:
  		flags |= (GPIO_V2_LINE_FLAG_EDGE_FALLING |
  			  GPIO_V2_LINE_FLAG_INPUT);
-		flags &= ~GPIOD_LINE_DIRECTION_OUTPUT;
+		flags &= ~GPIO_V2_LINE_FLAG_OUTPUT;
  		break;
  	case GPIOD_LINE_EDGE_RISING:
  		flags |= (GPIO_V2_LINE_FLAG_EDGE_RISING |
  			  GPIO_V2_LINE_FLAG_INPUT);
-		flags &= ~GPIOD_LINE_DIRECTION_OUTPUT;
+		flags &= ~GPIO_V2_LINE_FLAG_OUTPUT;
  		break;
  	case GPIOD_LINE_EDGE_BOTH:
  		flags |= (GPIO_V2_LINE_FLAG_EDGE_FALLING |
  			  GPIO_V2_LINE_FLAG_EDGE_RISING |
  			  GPIO_V2_LINE_FLAG_INPUT);
-		flags &= ~GPIOD_LINE_DIRECTION_OUTPUT;
+		flags &= ~GPIO_V2_LINE_FLAG_OUTPUT;
  		break;
  	default:
  		break;