projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
media
/
video
/
mt9t031.c
diff --git
a/drivers/media/video/mt9t031.c
b/drivers/media/video/mt9t031.c
index 1a9d53966d06cf251816488c780f3a347fed3d84..349d8e36553087886354ff8771cf4b1cab12c4c5 100644
(file)
--- a/
drivers/media/video/mt9t031.c
+++ b/
drivers/media/video/mt9t031.c
@@
-326,14
+326,14
@@
static int mt9t031_try_fmt(struct soc_camera_device *icd,
}
static int mt9t031_get_chip_id(struct soc_camera_device *icd,
}
static int mt9t031_get_chip_id(struct soc_camera_device *icd,
- struct v4l2_chip_ident *id)
+ struct v4l2_
dbg_
chip_ident *id)
{
struct mt9t031 *mt9t031 = container_of(icd, struct mt9t031, icd);
{
struct mt9t031 *mt9t031 = container_of(icd, struct mt9t031, icd);
- if (id->match
_
type != V4L2_CHIP_MATCH_I2C_ADDR)
+ if (id->match
.
type != V4L2_CHIP_MATCH_I2C_ADDR)
return -EINVAL;
return -EINVAL;
- if (id->match
_chip
!= mt9t031->client->addr)
+ if (id->match
.addr
!= mt9t031->client->addr)
return -ENODEV;
id->ident = mt9t031->model;
return -ENODEV;
id->ident = mt9t031->model;
@@
-344,14
+344,14
@@
static int mt9t031_get_chip_id(struct soc_camera_device *icd,
#ifdef CONFIG_VIDEO_ADV_DEBUG
static int mt9t031_get_register(struct soc_camera_device *icd,
#ifdef CONFIG_VIDEO_ADV_DEBUG
static int mt9t031_get_register(struct soc_camera_device *icd,
- struct v4l2_register *reg)
+ struct v4l2_
dbg_
register *reg)
{
struct mt9t031 *mt9t031 = container_of(icd, struct mt9t031, icd);
{
struct mt9t031 *mt9t031 = container_of(icd, struct mt9t031, icd);
- if (reg->match
_
type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
+ if (reg->match
.
type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
return -EINVAL;
return -EINVAL;
- if (reg->match
_chip
!= mt9t031->client->addr)
+ if (reg->match
.addr
!= mt9t031->client->addr)
return -ENODEV;
reg->val = reg_read(icd, reg->reg);
return -ENODEV;
reg->val = reg_read(icd, reg->reg);
@@
-363,14
+363,14
@@
static int mt9t031_get_register(struct soc_camera_device *icd,
}
static int mt9t031_set_register(struct soc_camera_device *icd,
}
static int mt9t031_set_register(struct soc_camera_device *icd,
- struct v4l2_register *reg)
+ struct v4l2_
dbg_
register *reg)
{
struct mt9t031 *mt9t031 = container_of(icd, struct mt9t031, icd);
{
struct mt9t031 *mt9t031 = container_of(icd, struct mt9t031, icd);
- if (reg->match
_
type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
+ if (reg->match
.
type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
return -EINVAL;
return -EINVAL;
- if (reg->match
_chip
!= mt9t031->client->addr)
+ if (reg->match
.addr
!= mt9t031->client->addr)
return -ENODEV;
if (reg_write(icd, reg->reg, reg->val) < 0)
return -ENODEV;
if (reg_write(icd, reg->reg, reg->val) < 0)