diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
| commit | adf6d34e460387ee3e8f1e1875d52bff51212c7d (patch) | |
| tree | 88ef100143e6184103a608f82dfd232bf6376eaf /drivers/media/video/saa7114.c | |
| parent | d1964dab60ce7c104dd21590e987a8787db18051 (diff) | |
| parent | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (diff) | |
Merge branch 'omap2-upstream' into devel
Diffstat (limited to 'drivers/media/video/saa7114.c')
| -rw-r--r-- | drivers/media/video/saa7114.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c index 677df51de1a9..bf91a4faa706 100644 --- a/drivers/media/video/saa7114.c +++ b/drivers/media/video/saa7114.c | |||
| @@ -841,7 +841,7 @@ saa7114_detect_client (struct i2c_adapter *adapter, | |||
| 841 | return 0; | 841 | return 0; |
| 842 | 842 | ||
| 843 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); | 843 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); |
| 844 | if (client == 0) | 844 | if (!client) |
| 845 | return -ENOMEM; | 845 | return -ENOMEM; |
| 846 | client->addr = address; | 846 | client->addr = address; |
| 847 | client->adapter = adapter; | 847 | client->adapter = adapter; |