2 files changed, 1 insertions, 2 deletions

diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index e6538eb3aa17..e8488430cdbd 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1667,6 +1667,5 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
         .name = "saa7115",
         .probe = saa711x_probe,
         .remove = saa711x_remove,
-        .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
         .id_table = saa7115_id,
 };
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 28af7b7e9512..cc5f018b8eb4 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -1020,7 +1020,7 @@ static void tuner_lookup(struct i2c_adapter *adap,
                 int mode_mask;
 
                 if (pos->i2c->adapter != adap ||
-                    pos->i2c->driver->id != I2C_DRIVERID_TUNER)
+                    strcmp(pos->i2c->driver->driver.name, "tuner"))
                         continue;
 
                 mode_mask = pos->mode_mask & ~T_STANDBY;