patch-2.4.13 linux/drivers/media/video/bttv-if.c

Next file: linux/drivers/media/video/bttv.h
Previous file: linux/drivers/media/video/bttv-driver.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.12/linux/drivers/media/video/bttv-if.c linux/drivers/media/video/bttv-if.c
@@ -209,7 +209,8 @@
 	if (btv->tuner_type != -1)
 		bttv_call_i2c_clients(btv,TUNER_SET_TYPE,&btv->tuner_type);
         if (bttv_verbose)
-		printk("bttv%d: i2c attach [%s]\n",btv->nr,client->name);
+		printk("bttv%d: i2c attach [client=%s,%s]\n",btv->nr,
+		       client->name, (i < I2C_CLIENTS_MAX) ?  "ok" : "failed");
         return 0;
 }
 
@@ -218,14 +219,15 @@
         struct bttv *btv = (struct bttv*)client->adapter->data;
 	int i;
 
-        if (bttv_verbose)
-		printk("bttv%d: i2c detach [%s]\n",btv->nr,client->name);
 	for (i = 0; i < I2C_CLIENTS_MAX; i++) {
 		if (btv->i2c_clients[i] == client) {
 			btv->i2c_clients[i] = NULL;
 			break;
 		}
 	}
+        if (bttv_verbose)
+		printk("bttv%d: i2c detach [client=%s,%s]\n",btv->nr,
+		       client->name, (i < I2C_CLIENTS_MAX) ?  "ok" : "failed");
         return 0;
 }
 
@@ -351,7 +353,6 @@
 	btv->i2c_rc = i2c_bit_add_bus(&btv->i2c_adap);
 	return btv->i2c_rc;
 }
-MODULE_LICENSE("GPL");
 
 /*
  * Local variables:

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)