diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-02-16 09:20:45 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-02-16 09:20:45 -0200 |
| commit | 8c755c29108f00c354e3dfa24a2a546be566f604 (patch) | |
| tree | 43416b4bc6f85d655ab63e84a1d8a751e2b4de09 /drivers/media | |
| parent | 360104e3b8485f4923ffc202c1c2b36841de673c (diff) | |
| parent | 9727a9545adec59f4bccb83d1a709711f4acf242 (diff) | |
| download | blackbird-op-linux-8c755c29108f00c354e3dfa24a2a546be566f604.tar.gz blackbird-op-linux-8c755c29108f00c354e3dfa24a2a546be566f604.zip | |
Merge branch 'fixes' into patchwork
Some macros were changed/removed at the material for v4.5. We need
to sync with those changes here, in order to avoid troubles.
* v4l_for_linus:
[media] media.h: get rid of MEDIA_ENT_F_CONN_TEST
[media] [for,v4.5] media.h: increase the spacing between function ranges
[media] media: i2c/adp1653: probe: fix erroneous return value
[media] media: davinci_vpfe: fix missing unlock on error in vpfe_prepare_pipeline()
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/i2c/adp1653.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/i2c/adp1653.c b/drivers/media/i2c/adp1653.c index 7e9cbf757e95..fb7ed730d932 100644 --- a/drivers/media/i2c/adp1653.c +++ b/drivers/media/i2c/adp1653.c @@ -497,7 +497,7 @@ static int adp1653_probe(struct i2c_client *client, if (!client->dev.platform_data) { dev_err(&client->dev, "Neither DT not platform data provided\n"); - return EINVAL; + return -EINVAL; } flash->platform_data = client->dev.platform_data; } |
