projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
media
/
usb
/
gspca
/
gspca.c
diff --git
a/drivers/media/usb/gspca/gspca.c
b/drivers/media/usb/gspca/gspca.c
index
f3a7ace
..
1b3d7bf
100644
(file)
--- a/
drivers/media/usb/gspca/gspca.c
+++ b/
drivers/media/usb/gspca/gspca.c
@@
-1102,8
+1102,8
@@
static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
struct gspca_dev *gspca_dev = video_drvdata(file);
fmt->fmt.pix = gspca_dev->pixfmt;
struct gspca_dev *gspca_dev = video_drvdata(file);
fmt->fmt.pix = gspca_dev->pixfmt;
- /* some drivers use priv internally, zero it before giving it to
-
userspac
e */
+ /* some drivers use priv internally, zero it before giving it
back
to
+
the cor
e */
fmt->fmt.pix.priv = 0;
return 0;
}
fmt->fmt.pix.priv = 0;
return 0;
}
@@
-1139,8
+1139,8
@@
static int try_fmt_vid_cap(struct gspca_dev *gspca_dev,
fmt->fmt.pix.height = h;
gspca_dev->sd_desc->try_fmt(gspca_dev, fmt);
}
fmt->fmt.pix.height = h;
gspca_dev->sd_desc->try_fmt(gspca_dev, fmt);
}
- /* some drivers use priv internally, zero it before giving it to
-
userspac
e */
+ /* some drivers use priv internally, zero it before giving it
back
to
+
the cor
e */
fmt->fmt.pix.priv = 0;
return mode; /* used when s_fmt */
}
fmt->fmt.pix.priv = 0;
return mode; /* used when s_fmt */
}