From 955f6572749081bac420f8eb5e0ef02680b77021 Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Thu, 26 May 2011 04:49:52 -0300 Subject: [PATCH] --- yaml --- r: 261298 b: refs/heads/master c: 2c7988ab0effa9e41bd9c9db5cb33ddda870ca10 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/sr030pc30.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eeb504c74774..12c6ca9c6aad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5588dc2b025fd8b2188142b8d59efe562bd57d80 +refs/heads/master: 2c7988ab0effa9e41bd9c9db5cb33ddda870ca10 diff --git a/trunk/drivers/media/video/sr030pc30.c b/trunk/drivers/media/video/sr030pc30.c index c901721a1db3..8afb0e8a2e00 100644 --- a/trunk/drivers/media/video/sr030pc30.c +++ b/trunk/drivers/media/video/sr030pc30.c @@ -726,8 +726,10 @@ static int sr030pc30_s_power(struct v4l2_subdev *sd, int on) const struct sr030pc30_platform_data *pdata = info->pdata; int ret; - if (WARN(pdata == NULL, "No platform data!\n")) - return -ENOMEM; + if (pdata == NULL) { + WARN(1, "No platform data!\n"); + return -EINVAL; + } /* * Put sensor into power sleep mode before switching off @@ -746,6 +748,7 @@ static int sr030pc30_s_power(struct v4l2_subdev *sd, int on) if (on) { ret = sr030pc30_base_config(sd); } else { + ret = 0; info->curr_win = NULL; info->curr_fmt = NULL; }