All of lore.kernel.org
 help / color / mirror / Atom feed
* LinuxTv doesn't build anymore after upgrading Ubuntu to 3.13.0-88
@ 2016-06-13 17:14 Andreas Matthies
  2016-06-13 17:55 ` Hans Verkuil
  0 siblings, 1 reply; 7+ messages in thread
From: Andreas Matthies @ 2016-06-13 17:14 UTC (permalink / raw)
  To: linux-media

Hi.

Seems that there's a problem in v4.6_i2c_mux.patch. After Ubuntu was 
upgraded to 3.13.0-88 I tried to rebuild the tv drivers and get

make[2]: Entering directory `/home/andreas/Downloads/media_build/linux'
Applying patches for kernel 3.13.0-88-generic
patch -s -f -N -p1 -i ../backports/api_version.patch
patch -s -f -N -p1 -i ../backports/pr_fmt.patch
patch -s -f -N -p1 -i ../backports/debug.patch
patch -s -f -N -p1 -i ../backports/drx39xxj.patch
patch -s -f -N -p1 -i ../backports/v4.6_i2c_mux.patch
2 out of 23 hunks FAILED
make[2]: *** [apply_patches] Error 1

Here's the reject file rtl2832.c.rej:
--- drivers/media/dvb-frontends/rtl2832.c
+++ drivers/media/dvb-frontends/rtl2832.c
@@ -1124,7 +1280,7 @@
      else
          u8tmp = 0x00;

-    ret = regmap_update_bits(dev->regmap, 0x061, 0xc0, u8tmp);
+    ret = rtl2832_update_bits(client, 0x061, 0xc0, u8tmp);
      if (ret)
          goto err;

@@ -1159,14 +1315,14 @@
      buf[1] = (dev->filters >>  8) & 0xff;
      buf[2] = (dev->filters >> 16) & 0xff;
      buf[3] = (dev->filters >> 24) & 0xff;
-    ret = regmap_bulk_write(dev->regmap, 0x062, buf, 4);
+    ret = rtl2832_bulk_write(client, 0x062, buf, 4);
      if (ret)
          goto err;

      /* add PID */
      buf[0] = (pid >> 8) & 0xff;
      buf[1] = (pid >> 0) & 0xff;
-    ret = regmap_bulk_write(dev->regmap, 0x066 + 2 * index, buf, 2);
+    ret = rtl2832_bulk_write(client, 0x066 + 2 * index, buf, 2);
      if (ret)
          goto err;

And here's what the source file contains for the first reject:
...
     else
         u8tmp = 0x00;

     if (dev->slave_ts)
         ret = regmap_update_bits(dev->regmap, 0x021, 0xc0, u8tmp);
     else
         ret = regmap_update_bits(dev->regmap, 0x061, 0xc0, u8tmp);
     if (ret)
         goto err;
...

Hope you can make the drivers compile again soon.

. Andreas




^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-06-13 19:10 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-13 17:14 LinuxTv doesn't build anymore after upgrading Ubuntu to 3.13.0-88 Andreas Matthies
2016-06-13 17:55 ` Hans Verkuil
2016-06-13 18:48   ` Andreas Matthies
2016-06-13 18:52   ` Andreas Matthies
2016-06-13 18:59     ` Hans Verkuil
2016-06-13 19:01     ` Hans Verkuil
2016-06-13 19:10       ` Andreas Matthies

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.