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/bt819.c | |
| parent | d1964dab60ce7c104dd21590e987a8787db18051 (diff) | |
| parent | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (diff) | |
Merge branch 'omap2-upstream' into devel
Diffstat (limited to 'drivers/media/video/bt819.c')
| -rw-r--r-- | drivers/media/video/bt819.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c index 12d1b9248be5..e663cc045c41 100644 --- a/drivers/media/video/bt819.c +++ b/drivers/media/video/bt819.c | |||
| @@ -524,7 +524,7 @@ bt819_detect_client (struct i2c_adapter *adapter, | |||
| 524 | return 0; | 524 | return 0; |
| 525 | 525 | ||
| 526 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); | 526 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); |
| 527 | if (client == 0) | 527 | if (!client) |
| 528 | return -ENOMEM; | 528 | return -ENOMEM; |
| 529 | client->addr = address; | 529 | client->addr = address; |
| 530 | client->adapter = adapter; | 530 | client->adapter = adapter; |