Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1360944 > unrolled thread
| Started by | Max Kellermann <max@duempel.org> |
|---|---|
| First post | 2016-03-18 22:40 +0100 |
| Last post | 2016-03-21 07:40 +0100 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH 1/2] media/dvb-core: fix inverted check Max Kellermann <max@duempel.org> - 2016-03-18 22:40 +0100
[PATCH 2/2] media/dvb-core: forward media_create_pad_links() return value Max Kellermann <max@duempel.org> - 2016-03-18 22:40 +0100
Re: [PATCH 1/2] media/dvb-core: fix inverted check Olli Salonen <olli.salonen@iki.fi> - 2016-03-21 07:40 +0100
| From | Max Kellermann <max@duempel.org> |
|---|---|
| Date | 2016-03-18 22:40 +0100 |
| Subject | [PATCH 1/2] media/dvb-core: fix inverted check |
| Message-ID | <reahH-Ok-7@gated-at.bofh.it> |
Breakage caused by commit f50d51661a
Signed-off-by: Max Kellermann <max@duempel.org>
---
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;
}
[toc] | [next] | [standalone]
| From | Max Kellermann <max@duempel.org> |
|---|---|
| Date | 2016-03-18 22:40 +0100 |
| Subject | [PATCH 2/2] media/dvb-core: forward media_create_pad_links() return value |
| Message-ID | <reahI-Ok-11@gated-at.bofh.it> |
| In reply to | #1360944 |
Signed-off-by: Max Kellermann <max@duempel.org>
---
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 */
[toc] | [prev] | [next] | [standalone]
| From | Olli Salonen <olli.salonen@iki.fi> |
|---|---|
| Date | 2016-03-21 07:40 +0100 |
| Message-ID | <rf1Fo-1LR-35@gated-at.bofh.it> |
| In reply to | #1360944 |
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 <max@duempel.org> wrote:
> Breakage caused by commit f50d51661a
>
> Signed-off-by: Max Kellermann <max@duempel.org>
> ---
> 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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web