Merge branch 'rettichschnidi' into android

diff --git a/src/am7xxx.c b/src/am7xxx.c
index e5427ca..24b2b50 100644 (file)
--- a/src/am7xxx.c
+++ b/src/am7xxx.c
@@ -848,6 +848,7 @@ AM7XXX_PUBLIC int am7xxx_set_power_mode(am7xxx_device *dev, am7xxx_power_mode mo
                h.header_data.power.bit2 = 0;
                h.header_data.power.bit1 = 0;
                h.header_data.power.bit0 = 1;
+               break;
 
        case AM7XXX_POWER_MIDDLE:
                h.header_data.power.bit2 = 0;

diff --git a/src/serialize.h b/src/serialize.h
index e2dd7d4..f1869c9 100644 (file)
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* You can transform a serializazion block of code which uses put-* into the
+/* You can transform a serialization block of code which uses put-* into the
  * correspondent unserialization block with this vim substitution pattern:
  *
  *   s/put_\([^(]*\)(\([^,]*\),\s*\([^)]*\))/\2 = get_\1(\3)/g