diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/mt9m001.c | 6 | ||||
-rw-r--r-- | drivers/media/video/mt9v022.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c index e81b3247f79e..1a1a12453672 100644 --- a/drivers/media/video/mt9m001.c +++ b/drivers/media/video/mt9m001.c | |||
@@ -590,7 +590,7 @@ static int mt9m001_video_probe(struct soc_camera_device *icd) | |||
590 | return -ENODEV; | 590 | return -ENODEV; |
591 | 591 | ||
592 | /* Enable the chip */ | 592 | /* Enable the chip */ |
593 | data = reg_write(&mt9m001->icd, MT9M001_CHIP_ENABLE, 1); | 593 | data = reg_write(icd, MT9M001_CHIP_ENABLE, 1); |
594 | dev_dbg(&icd->dev, "write: %d\n", data); | 594 | dev_dbg(&icd->dev, "write: %d\n", data); |
595 | 595 | ||
596 | /* Read out the chip version register */ | 596 | /* Read out the chip version register */ |
@@ -642,8 +642,8 @@ static void mt9m001_video_remove(struct soc_camera_device *icd) | |||
642 | struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd); | 642 | struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd); |
643 | 643 | ||
644 | dev_dbg(&icd->dev, "Video %x removed: %p, %p\n", mt9m001->client->addr, | 644 | dev_dbg(&icd->dev, "Video %x removed: %p, %p\n", mt9m001->client->addr, |
645 | mt9m001->icd.dev.parent, mt9m001->icd.vdev); | 645 | icd->dev.parent, icd->vdev); |
646 | soc_camera_video_stop(&mt9m001->icd); | 646 | soc_camera_video_stop(icd); |
647 | } | 647 | } |
648 | 648 | ||
649 | static int mt9m001_probe(struct i2c_client *client, | 649 | static int mt9m001_probe(struct i2c_client *client, |
diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c index be20747b8138..14a5f9c21ffa 100644 --- a/drivers/media/video/mt9v022.c +++ b/drivers/media/video/mt9v022.c | |||
@@ -766,8 +766,8 @@ static void mt9v022_video_remove(struct soc_camera_device *icd) | |||
766 | struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd); | 766 | struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd); |
767 | 767 | ||
768 | dev_dbg(&icd->dev, "Video %x removed: %p, %p\n", mt9v022->client->addr, | 768 | dev_dbg(&icd->dev, "Video %x removed: %p, %p\n", mt9v022->client->addr, |
769 | mt9v022->icd.dev.parent, mt9v022->icd.vdev); | 769 | icd->dev.parent, icd->vdev); |
770 | soc_camera_video_stop(&mt9v022->icd); | 770 | soc_camera_video_stop(icd); |
771 | } | 771 | } |
772 | 772 | ||
773 | static int mt9v022_probe(struct i2c_client *client, | 773 | static int mt9v022_probe(struct i2c_client *client, |