Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (345 commits)
  V4L/DVB (13542): ir-keytable: Allow dynamic table change
  V4L/DVB (13541): atbm8830: replace 64-bit division and floating point usage
  V4L/DVB (13540): ir-common: Cleanup get key evdev code
  V4L/DVB (13539): ir-common: add __func__ for debug messages
  V4L/DVB (13538): ir-common: Use a dynamic keycode table
  V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation
  V4L/DVB (13536): em28xx: Use the full RC5 code on HVR-950 Remote Controller
  V4L/DVB (13535): ir-common: Add a hauppauge new table with the complete RC5 code
  V4L/DVB (13534): ir-common: Remove some unused fields/structs
  V4L/DVB (13533): ir: use dynamic tables, instead of static ones
  V4L/DVB (13532): ir-common: Add infrastructure to use a dynamic keycode table
  V4L/DVB (13531): ir-common: rename the debug routine to allow exporting it
  V4L/DVB (13458): go7007: subdev conversion
  V4L/DVB (13457): s2250: subdev conversion
  V4L/DVB (13456): s2250: Change module structure
  V4L/DVB (13528): em28xx: add support for em2800 VC211A card
  em28xx: don't reduce scale to half size for em2800
  em28xx: don't load audio modules when AC97 is mis-detected
  em28xx: em2800 chips support max width of 640
  V4L/DVB (13523): dvb-bt8xx: fix compile warning
  ...

Fix up trivial conflicts due to spelling fixes from the trivial tree in
	Documentation/video4linux/gspca.txt
	drivers/media/video/cx18/cx18-mailbox.h

2 files changed, 14 insertions, 6 deletions

diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index 8ea915227674..983672aa2450 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -1055,7 +1055,7 @@ static const struct stb0899_s1_reg knc1_stb0899_s1_init_3[] = {
         { STB0899_TSCFGH                , 0x0c },
         { STB0899_TSCFGM                , 0x00 },
         { STB0899_TSCFGL                , 0x0c },
-        { STB0899_TSOUT                 , 0x0d }, /* 0x0d for CAM */
+        { STB0899_TSOUT                 , 0x4d }, /* 0x0d for CAM */
         { STB0899_RSSYNCDEL             , 0x00 },
         { STB0899_TSINHDELH             , 0x02 },
         { STB0899_TSINHDELM             , 0x00 },
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index b5c681372b6c..7d193ebc0aea 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -178,7 +178,7 @@ static void msp430_ir_interrupt(unsigned long data)
         if (budget_ci->ir.last_raw != raw || !timer_pending(&budget_ci->ir.timer_keyup)) {
                 ir_input_nokey(dev, &budget_ci->ir.state);
                 ir_input_keydown(dev, &budget_ci->ir.state,
-                                 budget_ci->ir.ir_key, raw);
+                                 budget_ci->ir.ir_key);
                 budget_ci->ir.last_raw = raw;
         }
 
@@ -224,8 +224,10 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         case 0x1011:
         case 0x1012:
                 /* The hauppauge keymap is a superset of these remotes */
-                ir_input_init(input_dev, &budget_ci->ir.state,
+                error = ir_input_init(input_dev, &budget_ci->ir.state,
                               IR_TYPE_RC5, &ir_codes_hauppauge_new_table);
+                if (error < 0)
+                        goto out2;
 
                 if (rc5_device < 0)
                         budget_ci->ir.rc5_device = 0x1f;
@@ -236,8 +238,10 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         case 0x1017:
         case 0x101a:
                 /* for the Technotrend 1500 bundled remote */
-                ir_input_init(input_dev, &budget_ci->ir.state,
+                error = ir_input_init(input_dev, &budget_ci->ir.state,
                               IR_TYPE_RC5, &ir_codes_tt_1500_table);
+                if (error < 0)
+                        goto out2;
 
                 if (rc5_device < 0)
                         budget_ci->ir.rc5_device = IR_DEVICE_ANY;
@@ -246,8 +250,10 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
                 break;
         default:
                 /* unknown remote */
-                ir_input_init(input_dev, &budget_ci->ir.state,
+                error = ir_input_init(input_dev, &budget_ci->ir.state,
                               IR_TYPE_RC5, &ir_codes_budget_ci_old_table);
+                if (error < 0)
+                        goto out2;
 
                 if (rc5_device < 0)
                         budget_ci->ir.rc5_device = IR_DEVICE_ANY;
@@ -280,6 +286,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         return 0;
 
 out2:
+        ir_input_free(input_dev);
         input_free_device(input_dev);
 out1:
         return error;
@@ -297,6 +304,7 @@ static void msp430_ir_deinit(struct budget_ci *budget_ci)
         del_timer_sync(&dev->timer);
         ir_input_nokey(dev, &budget_ci->ir.state);
 
+        ir_input_free(dev);
         input_unregister_device(dev);
 }
 
@@ -1248,7 +1256,7 @@ static const struct stb0899_s1_reg tt3200_stb0899_s1_init_3[] = {
         { STB0899_TSCFGH                , 0x0c },
         { STB0899_TSCFGM                , 0x00 },
         { STB0899_TSCFGL                , 0x0c },
-        { STB0899_TSOUT                 , 0x0d }, /* 0x0d for CAM */
+        { STB0899_TSOUT                 , 0x4d }, /* 0x0d for CAM */
         { STB0899_RSSYNCDEL             , 0x00 },
         { STB0899_TSINHDELH             , 0x02 },
         { STB0899_TSINHDELM             , 0x00 },