Merge branch 'linus' into xen-64bit

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

diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 12d1b9248be599faa2d7bababc59c9d4816632b8..ddd2a7964dec25f179fdf7633ffca9ccf690a3cf 100644 (file)
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -57,7 +57,7 @@ MODULE_LICENSE("GPL");
 #define I2C_NAME(s) (s)->name
 
 
-static int debug = 0;
+static int debug;
 module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
@@ -516,7 +516,7 @@ bt819_detect_client (struct i2c_adapter *adapter,
 
        dprintk(1,
                KERN_INFO
-               "saa7111.c: detecting bt819 client on address 0x%x\n",
+               "bt819: detecting bt819 client on address 0x%x\n",
                address << 1);
 
        /* Check if the adapter supports the needed features */
@@ -524,7 +524,7 @@ bt819_detect_client (struct i2c_adapter *adapter,
                return 0;
 
        client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-       if (client == 0)
+       if (!client)
                return -ENOMEM;
        client->addr = address;
        client->adapter = adapter;