git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
media
/
video
/
saa7110.c
diff --git
a/drivers/media/video/saa7110.c
b/drivers/media/video/saa7110.c
index
7bb85a7
..
676b997
100644
(file)
--- a/
drivers/media/video/saa7110.c
+++ b/
drivers/media/video/saa7110.c
@@
-39,11
+39,11
@@
MODULE_AUTHOR("Pauline Middelink");
MODULE_LICENSE("GPL");
#include <linux/i2c.h>
MODULE_LICENSE("GPL");
#include <linux/i2c.h>
-#include <linux/i2c-dev.h>
#define I2C_NAME(s) (s)->name
#include <linux/videodev.h>
#define I2C_NAME(s) (s)->name
#include <linux/videodev.h>
+#include <media/v4l2-common.h>
#include <linux/video_decoder.h>
static int debug = 0;
#include <linux/video_decoder.h>
static int debug = 0;
@@
-108,13
+108,8
@@
saa7110_write_block (struct i2c_client *client,
* the adapter understands raw I2C */
if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
struct saa7110 *decoder = i2c_get_clientdata(client);
* the adapter understands raw I2C */
if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
struct saa7110 *decoder = i2c_get_clientdata(client);
- struct i2c_msg msg;
- msg.len = len;
- msg.buf = (char *) data;
- msg.addr = client->addr;
- msg.flags = 0;
- ret = i2c_transfer(client->adapter, &msg, 1);
+ ret = i2c_master_send(client, data, len);
/* Cache the written data */
memcpy(decoder->reg + reg, data + 1, len - 1);
/* Cache the written data */
memcpy(decoder->reg + reg, data + 1, len - 1);
@@
-145,7
+140,7
@@
saa7110_read (struct i2c_client *client)
static int
saa7110_selmux (struct i2c_client *client,
static int
saa7110_selmux (struct i2c_client *client,
- int chan)
+ int chan)
{
static const unsigned char modes[9][8] = {
/* mode 0 */
{
static const unsigned char modes[9][8] = {
/* mode 0 */
@@
-432,15
+427,13
@@
saa7110_command (struct i2c_client *client,
break;
case DECODER_DUMP:
break;
case DECODER_DUMP:
- for (v = 0; v <
0x34
; v += 16) {
+ for (v = 0; v <
SAA7110_NR_REG
; v += 16) {
int j;
int j;
- dprintk(1, KERN_
INFO "%s: %03x\n
", I2C_NAME(client),
+ dprintk(1, KERN_
DEBUG "%s: %02x:
", I2C_NAME(client),
v);
v);
- for (j = 0; j < 16; j++) {
- dprintk(1, KERN_INFO " %02x",
- decoder->reg[v + j]);
- }
- dprintk(1, KERN_INFO "\n");
+ for (j = 0; j < 16 && v + j < SAA7110_NR_REG; j++)
+ dprintk(1, " %02x", decoder->reg[v + j]);
+ dprintk(1, "\n");
}
break;
}
break;
@@
-465,7
+458,7
@@
static unsigned short normal_i2c[] = {
};
static unsigned short ignore = I2C_CLIENT_END;
};
static unsigned short ignore = I2C_CLIENT_END;
-
+
static struct i2c_client_address_data addr_data = {
.normal_i2c = normal_i2c,
.probe = &ignore,
static struct i2c_client_address_data addr_data = {
.normal_i2c = normal_i2c,
.probe = &ignore,