Merge branch 'omap2-upstream' into devel

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index 061134a7ba9f..1df2602cd184 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -488,7 +488,7 @@ saa7110_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;
@@ -496,7 +496,7 @@ saa7110_detect_client (struct i2c_adapter *adapter,
         strlcpy(I2C_NAME(client), "saa7110", sizeof(I2C_NAME(client)));
 
         decoder = kzalloc(sizeof(struct saa7110), GFP_KERNEL);
-        if (decoder == 0) {
+        if (!decoder) {
                 kfree(client);
                 return -ENOMEM;
         }