[{"id":12189,"web_url":"https://patchwork.libcamera.org/comment/12189/","msgid":"","date":"2020-08-28T06:32:38","subject":"Re: [libcamera-devel] [PATCH v3] MediaLink: Make\n\tMediaLink::setEnabled account for existing","submitter":{"id":67,"url":"https://patchwork.libcamera.org/api/people/67/","name":"Daniel Scally","email":"djrscally@googlemail.com"},"content":"Forgot to CC the list in reply to Laurent, but I agree his proposed change\nis better - and still fixes the problem I was having.\n\nWasn't sure if you wanted me to resubmit but I wanted to try git\nsend-email, hopefully this time it'll apply cleanly.\n\nDan\n\nOn Fri, 28 Aug 2020, 07:27 Dan Scally, wrote:\n\n> The setupLink function fails (ioctl returns EINVAL) when it passes the\n> MEDIA_LNK_FL_ENABLE flag to a link that is already flagged with\n> MEDIA_LNK_FL_ENABLE and MEDIA_LNK_FL_IMMUTABLE. Contrast to media-ctl's\n> equivalent media_setup_link() which ORs the new flags with the existing\n> values. This patch modifies the behaviour of setupLink() to behave the\n> same as media_setup_link() in media-ctl.\n>\n> Signed-off-by: Dan Scally \n> ---\n>\n> Changelog:\n>\n> v3 - Moved the change to MediaLink::setEnabled()\n>\n> v2 - Simplified by removing the call to link() to fetch a link\n> that's\n> already passed as a parameter to the function.\n>\n> src/libcamera/media_object.cpp | 3 ++-\n> 1 file changed, 2 insertions(+), 1 deletion(-)\n>\n> diff --git a/src/libcamera/media_object.cpp\n> b/src/libcamera/media_object.cpp\n> index ce77a72..a2e6a0d 100644\n> --- a/src/libcamera/media_object.cpp\n> +++ b/src/libcamera/media_object.cpp\n> @@ -115,7 +115,8 @@ LOG_DECLARE_CATEGORY(MediaDevice)\n> */\n> int MediaLink::setEnabled(bool enable)\n> {\n> - unsigned int flags = enable ? MEDIA_LNK_FL_ENABLED : 0;\n> + unsigned int flags = (flags_ & ~MEDIA_LNK_FL_ENABLED)\n> + | (enable ?\n> MEDIA_LNK_FL_ENABLED : 0);\n>\n> int ret = dev_->setupLink(this, flags);\n> if (ret)\n> --\n> 2.25.1\n>\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 87D10BF019\n\tfor ;\n\tFri, 28 Aug 2020 08:26:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 98D8562912;\n\tFri, 28 Aug 2020 10:26:24 +0200 (CEST)","from mail-oi1-x244.google.com (mail-oi1-x244.google.com\n\t[IPv6:2607:f8b0:4864:20::244])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5A49B628EE\n\tfor ;\n\tFri, 28 Aug 2020 08:32:51 +0200 (CEST)","by mail-oi1-x244.google.com with SMTP id z22so6841810oid.1\n\tfor ;\n\tThu, 27 Aug 2020 23:32:51 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=googlemail.com header.i=@googlemail.com\n\theader.b=\"cOmiFWvq\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=googlemail.com; s=20161025;\n\th=mime-version:references:in-reply-to:from:date:message-id:subject:to;\n\tbh=Rv+GD7RuU7QEks9Fs63sst7OVKtl5L5eXZaudr20ANo=;\n\tb=cOmiFWvqeqwjxSxq7qyRyp3ENsQC05WrVivSsIJsT7e/UFWfeTGmoKmhXPLBXPXXyA\n\tQZSHxoaExNsOOB4cGuqHQj/riW0IKpiqeSnONTZivwDyeT59QPFJlLQBNLAQcykPQxbK\n\tT9ukDked084BmiAVEWx/sn/zq5xfGMoSPLlSRiW2aH3wcNu444HgmTuBowN0Cw0ynfhl\n\tdVR8C4ReNF9TaAS856v9Q5yNGJiIlHfMywz3Eh8CNVANl33IiPVjkTDKl/6cxqF94zeM\n\tfyMs5yVE9wur8ygmHMZ6TaAsKbdDo6O6n0eFcNekLYO897xecRGHXisnY8JXsT4rYSCS\n\tMNdA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to;\n\tbh=Rv+GD7RuU7QEks9Fs63sst7OVKtl5L5eXZaudr20ANo=;\n\tb=TG+1CvObBCS1zydZAoJ5yB4xlhXlIBGfKfhXJSv/9QtOjjoRc77JxEv1AV8/3OxTfV\n\tTWbaHowwwp6FtHaGoe39xrA3nSZUrCJxlsW1eE1Ix8eCkg1r9wf6PY1WfReXOSh+T9fY\n\tyrAhGsxV15zr6XlI/wre46gWRjtuoUSCnXsrLpeLFiSIxRWIaNhehqKF/hyMARLQHi87\n\tlxvtPTBFdbeVaB696NJ/WxrBdbBPEBmCA2FM2pHDjltVGYigZtRPoK7d0bo4Oz4KtheG\n\tqsGugcoi5L+aNPT4xGmaJIghatiJK2DBiOcy8UE18BSyUcjYEew6ntcCmCdJHs4UWRXW\n\tbuSg==","X-Gm-Message-State":"AOAM5308/GaB8AylpOsDVFc0KukowyIPo0nNtyWxFzKdzcCylSF4/653\n\tW8jQgf4Q+qmTzq2Jck8HVpU4tumxShAEf+zaZ6X2mB4m3ro=","X-Google-Smtp-Source":"ABdhPJyc8A/iGwgOsgH595gcj72RnnWtpiH3ez+rarxoEOpp7ZVfURAQYQMCmgzgbqiGGc9gyVHu5VsA2ceTozShHd4=","X-Received":"by 2002:a05:6808:1d9:: with SMTP id\n\tx25mr127886oic.92.1598596369625; \n\tThu, 27 Aug 2020 23:32:49 -0700 (PDT)","MIME-Version":"1.0","References":"<20200828062520.1110800-1-djrscally@gmail.com>","In-Reply-To":"<20200828062520.1110800-1-djrscally@gmail.com>","From":"Daniel Scally ","Date":"Fri, 28 Aug 2020 07:32:38 +0100","Message-ID":"","To":"libcamera-devel@lists.libcamera.org","X-Mailman-Approved-At":"Fri, 28 Aug 2020 10:26:22 +0200","Subject":"Re: [libcamera-devel] [PATCH v3] MediaLink: Make\n\tMediaLink::setEnabled account for existing","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"multipart/mixed;\n\tboundary=\"===============4095958743557412406==\"","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":12191,"web_url":"https://patchwork.libcamera.org/comment/12191/","msgid":"","date":"2020-08-28T09:40:45","subject":"Re: [libcamera-devel] [PATCH v3] MediaLink: Make\n\tMediaLink::setEnabled account for existing","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Dan,\n\nThankyou, and yes - this git-send-mail version applies perfectly well\nwith git-am.\n\n\nOn 28/08/2020 07:25, Dan Scally wrote:\n> The setupLink function fails (ioctl returns EINVAL) when it passes the\n> MEDIA_LNK_FL_ENABLE flag to a link that is already flagged with\n> MEDIA_LNK_FL_ENABLE and MEDIA_LNK_FL_IMMUTABLE. Contrast to media-ctl's\n> equivalent media_setup_link() which ORs the new flags with the existing\n> values. This patch modifies the behaviour of setupLink() to behave the\n> same as media_setup_link() in media-ctl.\n> \n> Signed-off-by: Dan Scally \n> ---\n> \n> Changelog:\n> \n> \tv3 - Moved the change to MediaLink::setEnabled()\n> \n> \tv2 - Simplified by removing the call to link() to fetch a link that's\n> \t\talready passed as a parameter to the function.\n> \n> src/libcamera/media_object.cpp | 3 ++-\n> 1 file changed, 2 insertions(+), 1 deletion(-)\n> \n> diff --git a/src/libcamera/media_object.cpp b/src/libcamera/media_object.cpp\n> index ce77a72..a2e6a0d 100644\n> --- a/src/libcamera/media_object.cpp\n> +++ b/src/libcamera/media_object.cpp\n> @@ -115,7 +115,8 @@ LOG_DECLARE_CATEGORY(MediaDevice)\n> */\n> int MediaLink::setEnabled(bool enable)\n> {\n> -\tunsigned int flags = enable ? MEDIA_LNK_FL_ENABLED : 0;\n> +\tunsigned int flags = (flags_ & ~MEDIA_LNK_FL_ENABLED)\n> +\t\t\t \t\t\t| (enable ? MEDIA_LNK_FL_ENABLED : 0);\n\nTo fit our coding style, that second line should be aligned so that the\n| operator is below the = operator I think ... but that's really minor\nand is easily handled when applying.\n\nOther than that, this sounds like a better approach that v2 indeed,\nespecially as now the flags_ is going to be kept consistent.\n\nReviewed-by: Kieran Bingham \n\n> \n> \tint ret = dev_->setupLink(this, flags);\n> \tif (ret)\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 38C87BF019\n\tfor ;\n\tFri, 28 Aug 2020 09:41:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 825E662912;\n\tFri, 28 Aug 2020 11:40:59 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 466DC61EA0\n\tfor ;\n\tFri, 28 Aug 2020 11:40:58 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id BDAE81291;\n\tFri, 28 Aug 2020 11:40:47 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"V/27fi0u\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1598607651;\n\tbh=xsS7Eeij1E0WLJSHHi5+53M9f2l1cvEokd0Rz7trzXM=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=V/27fi0upVDzGIuvp6fEscqPuv87CS36An+ZxrNuvEeTDQdgOs1WroBxe+4dgfSnM\n\tJpXsB1IeDyQTx1EOQxi1by/+fkmMypyZ1vPBAw8YIyE6fj6rlbZYqlr9I/daj/KzyE\n\tb4dvI4B+2WoVBr11dKX8lCOSOTSRuSwCllqjj04M=","To":"Dan Scally ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200828062520.1110800-1-djrscally@gmail.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Fri, 28 Aug 2020 10:40:45 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20200828062520.1110800-1-djrscally@gmail.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v3] MediaLink: Make\n\tMediaLink::setEnabled account for existing","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":12220,"web_url":"https://patchwork.libcamera.org/comment/12220/","msgid":"<20200828165245.GN10034@pendragon.ideasonboard.com>","date":"2020-08-28T16:52:45","subject":"Re: [libcamera-devel] [PATCH v3] MediaLink: Make\n\tMediaLink::setEnabled account for existing","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Fri, Aug 28, 2020 at 10:40:45AM +0100, Kieran Bingham wrote:\n> Hi Dan,\n> \n> Thankyou, and yes - this git-send-mail version applies perfectly well\n> with git-am.\n> \n> On 28/08/2020 07:25, Dan Scally wrote:\n> > The setupLink function fails (ioctl returns EINVAL) when it passes the\n> > MEDIA_LNK_FL_ENABLE flag to a link that is already flagged with\n> > MEDIA_LNK_FL_ENABLE and MEDIA_LNK_FL_IMMUTABLE. Contrast to media-ctl's\n> > equivalent media_setup_link() which ORs the new flags with the existing\n> > values. This patch modifies the behaviour of setupLink() to behave the\n> > same as media_setup_link() in media-ctl.\n\nThe commit message is now out of date I'm afraid, as the patch doesn't\nmodify setupLink() anymore. No worries, I'll update this to\n\nThe MediaDevice::setupLink() function fails (ioctl returns EINVAL) when\nit passes only the MEDIA_LNK_FL_ENABLE flag to a link that is already\nflagged with MEDIA_LNK_FL_ENABLE and MEDIA_LNK_FL_IMMUTABLE. Contrast to\nmedia-ctl's equivalent media_setup_link() which ORs the new flags with\nthe existing values. Fix this by preserving all flags but\nMEDIA_LNK_FL_ENABLED in MediaLink::setEnabled().\n\nThe subject line seems to also have been truncated, I think it misses\n\"flags\" at the end. It also should start with \"libcamera: media_object:\"\nto match the usual style of commit messages.\n\nPlease let me know if you have any objection.\n\n> > \n> > Signed-off-by: Dan Scally \n> > ---\n> > \n> > Changelog:\n> > \n> > \tv3 - Moved the change to MediaLink::setEnabled()\n> > \n> > \tv2 - Simplified by removing the call to link() to fetch a link that's\n> > \t\talready passed as a parameter to the function.\n> > \n> > src/libcamera/media_object.cpp | 3 ++-\n> > 1 file changed, 2 insertions(+), 1 deletion(-)\n> > \n> > diff --git a/src/libcamera/media_object.cpp b/src/libcamera/media_object.cpp\n> > index ce77a72..a2e6a0d 100644\n> > --- a/src/libcamera/media_object.cpp\n> > +++ b/src/libcamera/media_object.cpp\n> > @@ -115,7 +115,8 @@ LOG_DECLARE_CATEGORY(MediaDevice)\n> > */\n> > int MediaLink::setEnabled(bool enable)\n> > {\n> > -\tunsigned int flags = enable ? MEDIA_LNK_FL_ENABLED : 0;\n> > +\tunsigned int flags = (flags_ & ~MEDIA_LNK_FL_ENABLED)\n> > +\t\t\t \t\t\t| (enable ? MEDIA_LNK_FL_ENABLED : 0);\n> \n> To fit our coding style, that second line should be aligned so that the\n> | operator is below the = operator I think ... but that's really minor\n> and is easily handled when applying.\n> \n> Other than that, this sounds like a better approach that v2 indeed,\n> especially as now the flags_ is going to be kept consistent.\n> \n> Reviewed-by: Kieran Bingham \n\nWith this addressed,\n\nReviewed-by: Laurent Pinchart \n\n> > \n> > \tint ret = dev_->setupLink(this, flags);\n> > \tif (ret)\n> >","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 3F895BF019\n\tfor ;\n\tFri, 28 Aug 2020 16:53:08 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B901860379;\n\tFri, 28 Aug 2020 18:53:07 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 61FF460379\n\tfor ;\n\tFri, 28 Aug 2020 18:53:06 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B3254303;\n\tFri, 28 Aug 2020 18:53:05 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"GKQMtfvX\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1598633585;\n\tbh=IwrQBhp8Ftx8uQeNieMohtICLtWJnuNx9bi0FNBu6+s=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=GKQMtfvXl0khvo/Byyt4GBoKU5m3gvu85DorUkFiGP0RvZNMTu2KYLAXmnuIA8LgK\n\t2g6IUpRWP1nI/yjlzjkxIzEte+vfD03xMRpnFyBlVxfhjAERXsHJDGKwDAYSdSYJhu\n\teIVsDgMGz4UpC84G1mV3HzFtkYPbp6gLFj8fE/To=","Date":"Fri, 28 Aug 2020 19:52:45 +0300","From":"Laurent Pinchart ","To":"Kieran Bingham ","Message-ID":"<20200828165245.GN10034@pendragon.ideasonboard.com>","References":"<20200828062520.1110800-1-djrscally@gmail.com>\n\t","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"","Subject":"Re: [libcamera-devel] [PATCH v3] MediaLink: Make\n\tMediaLink::setEnabled account for existing","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org,\n\tDan Scally ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":12223,"web_url":"https://patchwork.libcamera.org/comment/12223/","msgid":"","date":"2020-08-28T21:52:50","subject":"Re: [libcamera-devel] [PATCH v3] MediaLink: Make\n\tMediaLink::setEnabled account for existing","submitter":{"id":67,"url":"https://patchwork.libcamera.org/api/people/67/","name":"Daniel Scally","email":"djrscally@googlemail.com"},"content":"Hi Laurent,\n\nNo objections from me\n\nDan\n\nOn Fri, 28 Aug 2020, 17:53 Laurent Pinchart, <\nlaurent.pinchart@ideasonboard.com> wrote:\n\n> On Fri, Aug 28, 2020 at 10:40:45AM +0100, Kieran Bingham wrote:\n> > Hi Dan,\n> >\n> > Thankyou, and yes - this git-send-mail version applies perfectly well\n> > with git-am.\n> >\n> > On 28/08/2020 07:25, Dan Scally wrote:\n> > > The setupLink function fails (ioctl returns EINVAL) when it passes the\n> > > MEDIA_LNK_FL_ENABLE flag to a link that is already flagged with\n> > > MEDIA_LNK_FL_ENABLE and MEDIA_LNK_FL_IMMUTABLE. Contrast to media-ctl's\n> > > equivalent media_setup_link() which ORs the new flags with the existing\n> > > values. This patch modifies the behaviour of setupLink() to behave the\n> > > same as media_setup_link() in media-ctl.\n>\n> The commit message is now out of date I'm afraid, as the patch doesn't\n> modify setupLink() anymore. No worries, I'll update this to\n>\n> The MediaDevice::setupLink() function fails (ioctl returns EINVAL) when\n> it passes only the MEDIA_LNK_FL_ENABLE flag to a link that is already\n> flagged with MEDIA_LNK_FL_ENABLE and MEDIA_LNK_FL_IMMUTABLE. Contrast to\n> media-ctl's equivalent media_setup_link() which ORs the new flags with\n> the existing values. Fix this by preserving all flags but\n> MEDIA_LNK_FL_ENABLED in MediaLink::setEnabled().\n>\n> The subject line seems to also have been truncated, I think it misses\n> \"flags\" at the end. It also should start with \"libcamera: media_object:\"\n> to match the usual style of commit messages.\n>\n> Please let me know if you have any objection.\n>\n> > >\n> > > Signed-off-by: Dan Scally \n> > > ---\n> > >\n> > > Changelog:\n> > >\n> > > v3 - Moved the change to MediaLink::setEnabled()\n> > >\n> > > v2 - Simplified by removing the call to link() to fetch a link\n> that's\n> > > already passed as a parameter to the function.\n> > >\n> > > src/libcamera/media_object.cpp | 3 ++-\n> > > 1 file changed, 2 insertions(+), 1 deletion(-)\n> > >\n> > > diff --git a/src/libcamera/media_object.cpp\n> b/src/libcamera/media_object.cpp\n> > > index ce77a72..a2e6a0d 100644\n> > > --- a/src/libcamera/media_object.cpp\n> > > +++ b/src/libcamera/media_object.cpp\n> > > @@ -115,7 +115,8 @@ LOG_DECLARE_CATEGORY(MediaDevice)\n> > > */\n> > > int MediaLink::setEnabled(bool enable)\n> > > {\n> > > - unsigned int flags = enable ? MEDIA_LNK_FL_ENABLED : 0;\n> > > + unsigned int flags = (flags_ & ~MEDIA_LNK_FL_ENABLED)\n> > > + | (enable ?\n> MEDIA_LNK_FL_ENABLED : 0);\n> >\n> > To fit our coding style, that second line should be aligned so that the\n> > | operator is below the = operator I think ... but that's really minor\n> > and is easily handled when applying.\n> >\n> > Other than that, this sounds like a better approach that v2 indeed,\n> > especially as now the flags_ is going to be kept consistent.\n> >\n> > Reviewed-by: Kieran Bingham \n>\n> With this addressed,\n>\n> Reviewed-by: Laurent Pinchart \n>\n> > >\n> > > int ret = dev_->setupLink(this, flags);\n> > > if (ret)\n> > >\n>\n> --\n> Regards,\n>\n> Laurent Pinchart\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 5AAE8BDC71\n\tfor ;\n\tFri, 28 Aug 2020 21:53:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C76B062912;\n\tFri, 28 Aug 2020 23:53:05 +0200 (CEST)","from mail-ot1-x342.google.com (mail-ot1-x342.google.com\n\t[IPv6:2607:f8b0:4864:20::342])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7527760379\n\tfor ;\n\tFri, 28 Aug 2020 23:53:03 +0200 (CEST)","by mail-ot1-x342.google.com with SMTP id r8so498250ota.6\n\tfor ;\n\tFri, 28 Aug 2020 14:53:03 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=googlemail.com header.i=@googlemail.com\n\theader.b=\"ZYW9Hpw4\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=googlemail.com; s=20161025;\n\th=mime-version:references:in-reply-to:from:date:message-id:subject:to\n\t:cc; bh=Qip/acgFwTYBqf9dqEHtIHTmbRuFjgpQaFh6rS6IFOk=;\n\tb=ZYW9Hpw4EoEK85UB9SyoZ0+WzsCXXtv1L+OjtOLSzTAATD8iU1AdlosQ0lQophsNyA\n\tdAwWG0sDEU+z1IZzTBRgqn9EADRypZEbPcx+EApZ6kZ9VpTlNUmwJXEVqH9Pyxwz1ib3\n\tswIvDwYOByEts8gdBKMwa63pgSEJV2FXnwctNvuSjhMfhOxX2LC6G7QV2xXTPqeAp39L\n\tYuQn0oonvbDLfa6XvI24iFPdSN0Hgn9XJAH3s7Fgbn6voEkXKZcxFmyClX0UT+bvoJx+\n\tiqNqpvRu7JHDMnAhTVJ/WXITj7ftV/CAEKvsO7WQQYuFRa6KL2mIG8UUrpfEcwVYMy24\n\t0a5A==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to:cc;\n\tbh=Qip/acgFwTYBqf9dqEHtIHTmbRuFjgpQaFh6rS6IFOk=;\n\tb=THDox22vJxS0lFJk1wpPmQOH/H8/K8jW4+6Mhycjpq+uvpNKhG/oiXv7gz+dIZmMS6\n\to1eyRSrcpqJBr+B02nFwkStRnIFKbBrLD+ExV1IaZMSsu8FeJAQzcSuh+iPInoSN8R4P\n\tFvL/lEWVlqT7DJwjXPODFjHRl4huTRWUOHYRWto0Ur1ApVQoG3YlgqsqapcruvPJJVF8\n\t/eaOjg0xaCK71JW2s4HHoQrl4r61Y7sfIV7Ix7ZjTp2NG1RMy9AbnV70eoVdnnOqMttL\n\tkNjpCxy4dUkZc2IfxsMxJuqIyW7aVNEXFEgXVmOB3YtFIBo3EMOdGMowgOYAPfZW4bEv\n\tnWKA==","X-Gm-Message-State":"AOAM531wlz7jgKpoZHKDQYe1D6Z/ouBU673KQzPgs9PR7ZSXpPLJSWuL\n\tn7/BylZj+wXRKe/mo5R3UxmOJJSjnZ5QBpXGruk1tVjFmJk=","X-Google-Smtp-Source":"ABdhPJwI/21wqUpHtWi3FdpRO/m99b3wq97MkqJ/R4ON80clgMXLlh9dTrJ3HEcJKGf5KLYQlFcX1WT0+BjiN4+m3NI=","X-Received":"by 2002:a05:6830:44c:: with SMTP id\n\td12mr501237otc.38.1598651582160; \n\tFri, 28 Aug 2020 14:53:02 -0700 (PDT)","MIME-Version":"1.0","References":"<20200828062520.1110800-1-djrscally@gmail.com>\n\t\n\t<20200828165245.GN10034@pendragon.ideasonboard.com>","In-Reply-To":"<20200828165245.GN10034@pendragon.ideasonboard.com>","From":"Daniel Scally ","Date":"Fri, 28 Aug 2020 22:52:50 +0100","Message-ID":"","To":"Laurent Pinchart ","Subject":"Re: [libcamera-devel] [PATCH v3] MediaLink: Make\n\tMediaLink::setEnabled account for existing","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"multipart/mixed;\n\tboundary=\"===============3671048910209471746==\"","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]