diff options
author | David S. Miller | 2008-04-03 23:33:42 +0200 |
---|---|---|
committer | David S. Miller | 2008-04-03 23:33:42 +0200 |
commit | 3bb5da3837cc1aa17736b05139c9a22c3794851a (patch) | |
tree | c92d5684a866542b1cb20641607ac1643ce03a47 /drivers/media/video/saa7111.c | |
parent | [NETNS]: Use TCP control socket from a correct namespace. (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
download | kernel-qcow2-linux-3bb5da3837cc1aa17736b05139c9a22c3794851a.tar.gz kernel-qcow2-linux-3bb5da3837cc1aa17736b05139c9a22c3794851a.tar.xz kernel-qcow2-linux-3bb5da3837cc1aa17736b05139c9a22c3794851a.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/media/video/saa7111.c')
-rw-r--r-- | drivers/media/video/saa7111.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c index 7ae2d646d000..a0772c53bb1f 100644 --- a/drivers/media/video/saa7111.c +++ b/drivers/media/video/saa7111.c @@ -502,7 +502,7 @@ saa7111_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; |