git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/pcm-estrpipe-in-pm' into for-linus
[pandora-kernel.git]
/
drivers
/
media
/
video
/
cs5345.c
diff --git
a/drivers/media/video/cs5345.c
b/drivers/media/video/cs5345.c
index
9714059
..
57dc170
100644
(file)
--- a/
drivers/media/video/cs5345.c
+++ b/
drivers/media/video/cs5345.c
@@
-53,14
+53,15
@@
static inline int cs5345_read(struct v4l2_subdev *sd, u8 reg)
return i2c_smbus_read_byte_data(client, reg);
}
return i2c_smbus_read_byte_data(client, reg);
}
-static int cs5345_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int cs5345_s_routing(struct v4l2_subdev *sd,
+ u32 input, u32 output, u32 config)
{
{
- if ((
route->
input & 0xf) > 6) {
- v4l2_err(sd, "Invalid input %d.\n",
route->
input);
+ if ((input & 0xf) > 6) {
+ v4l2_err(sd, "Invalid input %d.\n", input);
return -EINVAL;
}
return -EINVAL;
}
- cs5345_write(sd, 0x09,
route->
input & 0xf);
- cs5345_write(sd, 0x05,
route->
input & 0xf0);
+ cs5345_write(sd, 0x09, input & 0xf);
+ cs5345_write(sd, 0x05, input & 0xf0);
return 0;
}
return 0;
}