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
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
media
/
video
/
saa7111.c
diff --git
a/drivers/media/video/saa7111.c
b/drivers/media/video/saa7111.c
index
cb53427
..
0a87311
100644
(file)
--- a/
drivers/media/video/saa7111.c
+++ b/
drivers/media/video/saa7111.c
@@
-500,7
+500,6
@@
static struct i2c_client_address_data addr_data = {
.force = force
};
.force = force
};
-static int saa7111_i2c_id = 0;
static struct i2c_driver i2c_driver_saa7111;
static int
static struct i2c_driver i2c_driver_saa7111;
static int
@@
-530,9
+529,7
@@
saa7111_detect_client (struct i2c_adapter *adapter,
client->adapter = adapter;
client->driver = &i2c_driver_saa7111;
client->flags = I2C_CLIENT_ALLOW_USE;
client->adapter = adapter;
client->driver = &i2c_driver_saa7111;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = saa7111_i2c_id++;
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "saa7111[%d]", client->id);
+ strlcpy(I2C_NAME(client), "saa7111", sizeof(I2C_NAME(client)));
decoder = kmalloc(sizeof(struct saa7111), GFP_KERNEL);
if (decoder == NULL) {
decoder = kmalloc(sizeof(struct saa7111), GFP_KERNEL);
if (decoder == NULL) {