diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 02:55:27 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 02:55:27 -0500 |
| commit | fb53fde9762432d091dac209bdf4f3f850117c55 (patch) | |
| tree | 607b09022b206a539cb4a924e4ef476443798252 /drivers/media/video/tvp514x.c | |
| parent | eb4400e3a040b90a3ad805b01fcbc99a5f615c8f (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/media/video/tvp514x.c')
| -rw-r--r-- | drivers/media/video/tvp514x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/tvp514x.c b/drivers/media/video/tvp514x.c index ac9aa40d09f6..8e23aa53c29a 100644 --- a/drivers/media/video/tvp514x.c +++ b/drivers/media/video/tvp514x.c | |||
| @@ -1401,7 +1401,7 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
| 1401 | 1401 | ||
| 1402 | decoder->pdata = client->dev.platform_data; | 1402 | decoder->pdata = client->dev.platform_data; |
| 1403 | if (!decoder->pdata) { | 1403 | if (!decoder->pdata) { |
| 1404 | v4l_err(client, "No platform data\n!!"); | 1404 | v4l_err(client, "No platform data!!\n"); |
| 1405 | return -ENODEV; | 1405 | return -ENODEV; |
| 1406 | } | 1406 | } |
| 1407 | /* | 1407 | /* |