diff options
author | Jean Delvare <khali@linux-fr.org> | 2008-04-22 13:45:47 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:07:49 -0400 |
commit | d6f34d7adddb144c3b450e15df3749f0e0a651c6 (patch) | |
tree | c1fc5f810a31edf189520fe1d0cac38ef05b354c /drivers/media/video/ir-kbd-i2c.c | |
parent | 2c4a07b2da61bcd33f18195ff7f355c5bb285904 (diff) |
V4L/DVB (7332): ir-kbd-i2c: Minor optimization in ir_probe
This saves an initialization and a comparison.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ir-kbd-i2c.c')
-rw-r--r-- | drivers/media/video/ir-kbd-i2c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c index 58a1ddddb09e..7942bd078513 100644 --- a/drivers/media/video/ir-kbd-i2c.c +++ b/drivers/media/video/ir-kbd-i2c.c | |||
@@ -508,7 +508,7 @@ static int ir_probe(struct i2c_adapter *adap) | |||
508 | static const int probe_em28XX[] = { 0x30, 0x47, -1 }; | 508 | static const int probe_em28XX[] = { 0x30, 0x47, -1 }; |
509 | static const int probe_cx88[] = { 0x18, 0x6b, 0x71, -1 }; | 509 | static const int probe_cx88[] = { 0x18, 0x6b, 0x71, -1 }; |
510 | static const int probe_cx23885[] = { 0x6b, -1 }; | 510 | static const int probe_cx23885[] = { 0x6b, -1 }; |
511 | const int *probe = NULL; | 511 | const int *probe; |
512 | struct i2c_client *c; | 512 | struct i2c_client *c; |
513 | unsigned char buf; | 513 | unsigned char buf; |
514 | int i, rc; | 514 | int i, rc; |
@@ -532,9 +532,9 @@ static int ir_probe(struct i2c_adapter *adap) | |||
532 | case I2C_HW_B_CX23885: | 532 | case I2C_HW_B_CX23885: |
533 | probe = probe_cx23885; | 533 | probe = probe_cx23885; |
534 | break; | 534 | break; |
535 | } | 535 | default: |
536 | if (NULL == probe) | ||
537 | return 0; | 536 | return 0; |
537 | } | ||
538 | 538 | ||
539 | c = kzalloc(sizeof(*c), GFP_KERNEL); | 539 | c = kzalloc(sizeof(*c), GFP_KERNEL); |
540 | if (!c) | 540 | if (!c) |