2016-03-18 21:38:57

by Max Kellermann

Subject: [PATCH 1/2] media/dvb-core: fix inverted check

Breakage caused by commit f50d51661a

Signed-off-by: Max Kellermann <[email protected]>
---
drivers/media/dvb-core/dvbdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
index 560450a..c756d4b 100644
--- a/drivers/media/dvb-core/dvbdev.c
+++ b/drivers/media/dvb-core/dvbdev.c
@@ -682,7 +682,7 @@ int dvb_create_media_graph(struct dvb_adapter *adap,
if (demux && ca) {
ret = media_create_pad_link(demux, 1, ca,
0, MEDIA_LNK_FL_ENABLED);
- if (!ret)
+ if (ret)
return -ENOMEM;
}

2016-03-18 21:38:56

by Max Kellermann

Subject: [PATCH 2/2] media/dvb-core: forward media_create_pad_links() return value

Signed-off-by: Max Kellermann <[email protected]>
---
drivers/media/dvb-core/dvbdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
index c756d4b..96de2fa 100644
--- a/drivers/media/dvb-core/dvbdev.c
+++ b/drivers/media/dvb-core/dvbdev.c
@@ -677,13 +677,13 @@ int dvb_create_media_graph(struct dvb_adapter *adap,
demux, 0, MEDIA_LNK_FL_ENABLED,
false);
if (ret)
- return -ENOMEM;
+ return ret;
}
if (demux && ca) {
ret = media_create_pad_link(demux, 1, ca,
0, MEDIA_LNK_FL_ENABLED);
if (ret)
- return -ENOMEM;
+ return ret;
}

/* Create demux links for each ringbuffer/pad */

2016-03-21 06:39:28

by Olli Salonen

Subject: Re: [PATCH 1/2] media/dvb-core: fix inverted check

Hi Max,

Already in the tree:
http://git.linuxtv.org/media_tree.git/commit/drivers/media/dvb-core?id=711f3fba6ffd3914fd1b5ed9faf8d22bab6f2203

Cheers,
-olli

On 18 March 2016 at 23:31, Max Kellermann <[email protected]> wrote:
> Breakage caused by commit f50d51661a
>
> Signed-off-by: Max Kellermann <[email protected]>
> ---
> drivers/media/dvb-core/dvbdev.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
> index 560450a..c756d4b 100644
> --- a/drivers/media/dvb-core/dvbdev.c
> +++ b/drivers/media/dvb-core/dvbdev.c
> @@ -682,7 +682,7 @@ int dvb_create_media_graph(struct dvb_adapter *adap,
> if (demux && ca) {
> ret = media_create_pad_link(demux, 1, ca,
> 0, MEDIA_LNK_FL_ENABLED);
> - if (!ret)
> + if (ret)
> return -ENOMEM;
> }
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html