summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/sonixj.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-06-17 08:32:26 -0600
committerGrant Likely <grant.likely@secretlab.ca>2011-06-17 08:32:26 -0600
commitf8db4cc4f2b11bdded6c94f0d55906847474b982 (patch)
treed1b99d186edb9d203fafd896f19487125a2395af /drivers/media/video/gspca/sonixj.c
parent2e2de2e314672c8b6644f67a35556d6df780493d (diff)
parente479c60456ef22b0869432887216186aabaed086 (diff)
downloadop-kernel-dev-f8db4cc4f2b11bdded6c94f0d55906847474b982.zip
op-kernel-dev-f8db4cc4f2b11bdded6c94f0d55906847474b982.tar.gz
Merge branch 'spi/merge' into spi/next
Diffstat (limited to 'drivers/media/video/gspca/sonixj.c')
-rw-r--r--drivers/media/video/gspca/sonixj.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 6415aff..81b8a60 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -60,7 +60,7 @@ struct sd {
u32 pktsz; /* (used by pkt_scan) */
u16 npkt;
- u8 nchg;
+ s8 nchg;
s8 short_mark;
u8 quality; /* image quality */
OpenPOWER on IntegriCloud