V4L/DVB (11159): pvrusb2: Providing means to stop tracking an old i2c module

This implements a temporary mechanism to "untrack" an i2c module from
the old i2c layer.  The v4l2-subdev related code in the driver will
use this to remove a sub-device from the old i2c layer.  In the end,
once the old i2c layer is removed, this will also eventually go away.

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index faa94cef2c55..0e0d086bb278 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2020,6 +2020,12 @@ static void pvr2_hdw_load_subdev(struct pvr2_hdw *hdw,
                                                 i2caddr);
         }
 
+        /* If we have both old and new i2c layers enabled, make sure that
+           old layer isn't also tracking this module.  This is a debugging
+           aid, in normal situations there's no reason for both mechanisms
+           to be enabled. */
+        pvr2_i2c_untrack_subdev(hdw, sd);
+
         // ?????
         /* Based on module ID, we should remember subdev pointers
            so that we can send certain custom commands where