Merge remote-tracking branch 'origin/unstable' into rettichschnidi

diff --combined src/am7xxx.c
index 67718db,a8bcc49..883794b
--- 1/src/am7xxx.c
--- 2/src/am7xxx.c
+++ b/src/am7xxx.c
@@@ -244,7 -244,6 +244,7 @@@ static void debug_dump_header(am7xxx_co
        (void)ctx;
        (void)h;
  }
 +
  static void trace_dump_buffer(am7xxx_context *ctx, const char *message,
                              uint8_t *buffer, unsigned int len)
  {
@@@ -730,7 -729,7 +730,7 @@@ int am7xxx_calc_scaled_image_dimensions
        if (width_ratio > height_ratio) {
                /*
                 * The input is proportionally "wider" than the device viewport
-                * so it's height needs to be adjusted
+                * so its height needs to be adjusted
                 */
                debug(dev->ctx, "CASE 1, original image wider, adjust the scaled height\n");
                *scaled_width = device_info.native_width;