aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-11-09 00:37:36 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:19 -0500
commit4f9c05aa727a3b27e28972f2f3938b29ad81b833 (patch)
treed495fd8b59d2a85d0f6dd6329eb06277f5ed3678 /drivers
parente43f14af143921ac6680aa3ddfff111bef4e034a (diff)
[PATCH] v4l: 791: codingstyle fixes
- CodingStyle fixes Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Markus Rechberger <mrechberger@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/em28xx/em28xx-input.c8
-rw-r--r--drivers/media/video/ir-kbd-i2c.c12
2 files changed, 11 insertions, 9 deletions
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
index 3800b99e4b86..0576ad6c42b7 100644
--- a/drivers/media/video/em28xx/em28xx-input.c
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -86,15 +86,15 @@ static int get_key_terratec(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
86 } 86 }
87 87
88 /* it seems that 0xFE indicates that a button is still hold 88 /* it seems that 0xFE indicates that a button is still hold
89 down, while 0xFF indicates that no button is hold 89 down, while 0xff indicates that no button is hold
90 down. 0xFE sequences are sometimes interrupted by 0xFF */ 90 down. 0xfe sequences are sometimes interrupted by 0xFF */
91 91
92 dprintk("key %02x\n", b); 92 dprintk("key %02x\n", b);
93 93
94 if (b == 0xFF) 94 if (b == 0xff)
95 return 0; 95 return 0;
96 96
97 if (b == 0xFE) 97 if (b == 0xfe)
98 /* keep old data */ 98 /* keep old data */
99 return 1; 99 return 1;
100 100
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index c4701035ca20..b0facaa40b2f 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -206,15 +206,15 @@ static int get_key_knc1(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
206 } 206 }
207 207
208 /* it seems that 0xFE indicates that a button is still hold 208 /* it seems that 0xFE indicates that a button is still hold
209 down, while 0xFF indicates that no button is hold 209 down, while 0xff indicates that no button is hold
210 down. 0xFE sequences are sometimes interrupted by 0xFF */ 210 down. 0xfe sequences are sometimes interrupted by 0xFF */
211 211
212 dprintk(2,"key %02x\n", b); 212 dprintk(2,"key %02x\n", b);
213 213
214 if (b == 0xFF) 214 if (b == 0xff)
215 return 0; 215 return 0;
216 216
217 if (b == 0xFE) 217 if (b == 0xfe)
218 /* keep old data */ 218 /* keep old data */
219 return 1; 219 return 1;
220 220
@@ -429,7 +429,9 @@ static int ir_probe(struct i2c_adapter *adap)
429 static const int probe_saa7134[] = { 0x7a, -1 }; 429 static const int probe_saa7134[] = { 0x7a, -1 };
430 static const int probe_em2820[] = { 0x30, 0x47, -1 }; 430 static const int probe_em2820[] = { 0x30, 0x47, -1 };
431 const int *probe = NULL; 431 const int *probe = NULL;
432 struct i2c_client c; unsigned char buf; int i,rc; 432 struct i2c_client c;
433 unsigned char buf;
434 int i,rc;
433 435
434 switch (adap->id) { 436 switch (adap->id) {
435 case I2C_HW_B_BT848: 437 case I2C_HW_B_BT848: