diff options
Diffstat (limited to 'drivers/media/video/tuner-core.c')
-rw-r--r-- | drivers/media/video/tuner-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index 6328f0954e7..e8c854948de 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c | |||
@@ -206,7 +206,7 @@ static void set_type(struct i2c_client *c, unsigned int type, | |||
206 | 206 | ||
207 | set_freq(c, t->freq); | 207 | set_freq(c, t->freq); |
208 | tuner_dbg("%s %s I2C addr 0x%02x with type %d used for 0x%02x\n", | 208 | tuner_dbg("%s %s I2C addr 0x%02x with type %d used for 0x%02x\n", |
209 | c->adapter->name, c->driver->name, c->addr << 1, type, | 209 | c->adapter->name, c->driver->driver.name, c->addr << 1, type, |
210 | t->mode_mask); | 210 | t->mode_mask); |
211 | } | 211 | } |
212 | 212 | ||
@@ -742,13 +742,13 @@ static int tuner_resume(struct device *dev) | |||
742 | /* ----------------------------------------------------------------------- */ | 742 | /* ----------------------------------------------------------------------- */ |
743 | 743 | ||
744 | static struct i2c_driver driver = { | 744 | static struct i2c_driver driver = { |
745 | .owner = THIS_MODULE, | ||
746 | .name = "tuner", | ||
747 | .id = I2C_DRIVERID_TUNER, | 745 | .id = I2C_DRIVERID_TUNER, |
748 | .attach_adapter = tuner_probe, | 746 | .attach_adapter = tuner_probe, |
749 | .detach_client = tuner_detach, | 747 | .detach_client = tuner_detach, |
750 | .command = tuner_command, | 748 | .command = tuner_command, |
751 | .driver = { | 749 | .driver = { |
750 | .owner = THIS_MODULE, | ||
751 | .name = "tuner", | ||
752 | .suspend = tuner_suspend, | 752 | .suspend = tuner_suspend, |
753 | .resume = tuner_resume, | 753 | .resume = tuner_resume, |
754 | }, | 754 | }, |