Re: [PATCH] i2c driver changes for 2.5.66

Jan Dittmer
2003-03-25T09:06:05Z

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

Greg KH wrote:
> ChangeSet 1.889.355.14, 2003/03/22 23:20:40-08:00, greg@kroah.com
>
> i2c: fix up drivers/media/video/* due to previous i2c changes.
>

Additionally I need the following patch to tvmixer.c to compile properly
with CONFIG_SOUND_TVMIXER=m. Just a /client->name/client->dev.name/g.

Thanks,

Jan

[-- Attachment #2: tvmixer.diff --]
[-- Type: text/plain, Size: 2797 bytes --]

--- clean/drivers/media/video/tvmixer.c 2003-03-21 12:42:04.000000000 +0100
+++ work/drivers/media/video/tvmixer.c 2003-03-25 09:37:07.000000000 +0100
@@ -87,7 +87,7 @@
if (cmd == SOUND_MIXER_INFO) {
mixer_info info;
strncpy(info.id, "tv card", sizeof(info.id));
- strncpy(info.name, client->name, sizeof(info.name));
+ strncpy(info.name, client->dev.name, sizeof(info.name));
info.modify_counter = 42 /* FIXME */;
if (copy_to_user((void *)arg, &info, sizeof(info)))
return -EFAULT;
@@ -96,7 +96,7 @@
if (cmd == SOUND_OLD_MIXER_INFO) {
_old_mixer_info info;
strncpy(info.id, "tv card", sizeof(info.id));
- strncpy(info.name, client->name, sizeof(info.name));
+ strncpy(info.name, client->dev.name, sizeof(info.name));
if (copy_to_user((void *)arg, &info, sizeof(info)))
return -EFAULT;
return 0;
@@ -237,7 +237,7 @@
int i;

if (debug)
- printk("tvmixer: adapter %s\n",adap->name);
+ printk("tvmixer: adapter %s\n",adap->dev.name);
for (i=0; i<I2C_CLIENT_MAX; i++) {
if (!adap->clients[i])
continue;
@@ -261,10 +261,10 @@
/* ignore that one */
if (debug)
printk("tvmixer: %s is not a tv card\n",
- client->adapter->name);
+ client->adapter->dev.name);
return -1;
}
- printk("tvmixer: debug: %s\n",client->name);
+ printk("tvmixer: debug: %s\n",client->dev.name);

/* unregister ?? */
for (i = 0; i < DEV_MAX; i++) {
@@ -273,7 +273,7 @@
unregister_sound_mixer(devices[i].minor);
devices[i].dev = NULL;
devices[i].minor = -1;
- printk("tvmixer: %s unregistered (#1)\n",client->name);
+ printk("tvmixer: %s unregistered (#1)\n",client->dev.name);
return 0;
}
}
@@ -298,13 +298,13 @@
if (0 != client->driver->command(client,VIDIOCGAUDIO,&va)) {
if (debug)
printk("tvmixer: %s: VIDIOCGAUDIO failed\n",
- client->name);
+ client->dev.name);
return -1;
}
if (0 == (va.flags & VIDEO_AUDIO_VOLUME)) {
if (debug)
printk("tvmixer: %s: has no volume control\n",
- client->name);
+ client->dev.name);
return -1;
}

@@ -318,7 +318,7 @@
devices[i].count = 0;
devices[i].dev = client;
printk("tvmixer: %s (%s) registered with minor %d\n",
- client->name,client->adapter->name,minor);
+ client->dev.name,client->adapter->dev.name,minor);

return 0;
}
@@ -344,7 +344,7 @@
if (devices[i].minor != -1) {
unregister_sound_mixer(devices[i].minor);
printk("tvmixer: %s unregistered (#2)\n",
- devices[i].dev->name);
+ devices[i].dev->dev.name);
}
}
}