git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[media] cx88: implemented sharpness control
[pandora-kernel.git]
/
drivers
/
media
/
video
/
sr030pc30.c
diff --git
a/drivers/media/video/sr030pc30.c
b/drivers/media/video/sr030pc30.c
index
c901721
..
8afb0e8
100644
(file)
--- a/
drivers/media/video/sr030pc30.c
+++ b/
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;
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
/*
* 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 {
if (on) {
ret = sr030pc30_base_config(sd);
} else {
+ ret = 0;
info->curr_win = NULL;
info->curr_fmt = NULL;
}
info->curr_win = NULL;
info->curr_fmt = NULL;
}