From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 8 Mar 2016 14:45:35 +0000 (+0100)
Subject: fixed two mistakes detected by clang
X-Git-Tag: v4.2.1~934
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6fa9016b3beecaa39ba28f2be5a1da78ab9e5a3;p=thirdparty%2Ftvheadend.git

fixed two mistakes detected by clang
---

diff --git a/src/channels.c b/src/channels.c
index 84661b3c5..6365c353c 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -381,8 +381,7 @@ const idclass_t channel_class = {
                      "Always use the name defined by the network."),
       .off      = offsetof(channel_t, ch_autoname),
       .set      = channel_class_autoname_set,
-      .opts     = PO_ADVANCED,
-      .opts     = PO_NOSAVE,
+      .opts     = PO_ADVANCED | PO_NOSAVE,
     },
     {
       .type     = PT_STR,
diff --git a/src/input/mpegts/satip/satip.c b/src/input/mpegts/satip/satip.c
index f5dbea343..667925486 100644
--- a/src/input/mpegts/satip/satip.c
+++ b/src/input/mpegts/satip/satip.c
@@ -393,7 +393,7 @@ const idclass_t satip_device_class =
       .type     = PT_STR,
       .id       = "manufacturer",
       .name     = N_("Manufacturer"),
-      .name     = N_("The manufacturer of the SAT>IP server."),
+      .desc     = N_("The manufacturer of the SAT>IP server."),
       .opts     = PO_RDONLY | PO_NOSAVE,
       .off      = offsetof(satip_device_t, sd_info.manufacturer),
     },