2 files changed, 19 insertions, 5 deletions

diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index 4c28632f94c..53e3f2a7d31 100644
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -589,7 +589,12 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105)
         snprintf(dm1105->ir.input_phys, sizeof(dm1105->ir.input_phys),
                 "pci-%s/ir0", pci_name(dm1105->pdev));
 
-        ir_input_init(input_dev, &dm1105->ir.ir, ir_type, ir_codes);
+        err = ir_input_init(input_dev, &dm1105->ir.ir, ir_type, ir_codes);
+        if (err < 0) {
+                input_free_device(input_dev);
+                return err;
+        }
+
         input_dev->name = "DVB on-card IR receiver";
         input_dev->phys = dm1105->ir.input_phys;
         input_dev->id.bustype = BUS_PCI;
@@ -608,6 +613,7 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105)
 
         err = input_register_device(input_dev);
         if (err) {
+                ir_input_free(input_dev);
                 input_free_device(input_dev);
                 return err;
         }
@@ -617,8 +623,8 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105)
 
 void __devexit dm1105_ir_exit(struct dm1105dvb *dm1105)
 {
+        ir_input_free(dm1105->ir.input_dev);
         input_unregister_device(dm1105->ir.input_dev);
-
 }
 
 static int __devinit dm1105dvb_hw_init(struct dm1105dvb *dm1105dvb)
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index adc4b954e5a..7d193ebc0ae 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -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);
 }