Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / dpc7146.c

diff --git a/drivers/media/video/dpc7146.c b/drivers/media/video/dpc7146.c
index 0fcc935828f8e8a23e4f90523e3a54abfc3727a9..255dae303708d3b98142f33e850e48a8b8f1209f 100644 (file)
--- a/drivers/media/video/dpc7146.c
+++ b/drivers/media/video/dpc7146.c
@@ -92,7 +92,6 @@ static int dpc_probe(struct saa7146_dev* dev)
 {
        struct dpc* dpc = NULL;
        struct i2c_client *client;
-       struct list_head *item;
 
        dpc = kzalloc(sizeof(struct dpc), GFP_KERNEL);
        if( NULL == dpc ) {
@@ -116,11 +115,9 @@ static int dpc_probe(struct saa7146_dev* dev)
        }
 
        /* loop through all i2c-devices on the bus and look who is there */
-       list_for_each(item,&dpc->i2c_adapter.clients) {
-               client = list_entry(item, struct i2c_client, list);
+       list_for_each_entry(client, &dpc->i2c_adapter.clients, list)
                if( I2C_SAA7111A == client->addr )
                        dpc->saa7111a = client;
-       }
 
        /* check if all devices are present */
        if( 0 == dpc->saa7111a ) {