aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/rc
diff options
context:
space:
mode:
authorMaxim Levitsky <maximlevitsky@gmail.com>2013-07-07 19:22:45 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-07-29 09:39:40 -0400
commit1de6ebba2c2759da4d8ccb167336a4d136d08471 (patch)
tree6d520cc72d5512d636b834275ddc30d120742602 /drivers/media/rc
parent1444fbf268c4dd8c77790ea28bf7560b815c5b28 (diff)
[media] ene_ir: Fix interrupt line passthrough to hardware
While we can delay IRQ intialization, we need the interrupt number right away because unusually hardware have programable interrupt number, and thus we give it the number that was allocated by BIOS Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/rc')
-rw-r--r--drivers/media/rc/ene_ir.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c
index ed184f68c17c..4214311e3901 100644
--- a/drivers/media/rc/ene_ir.c
+++ b/drivers/media/rc/ene_ir.c
@@ -1022,6 +1022,8 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
1022 spin_lock_init(&dev->hw_lock); 1022 spin_lock_init(&dev->hw_lock);
1023 1023
1024 dev->hw_io = pnp_port_start(pnp_dev, 0); 1024 dev->hw_io = pnp_port_start(pnp_dev, 0);
1025 dev->irq = pnp_irq(pnp_dev, 0);
1026
1025 1027
1026 pnp_set_drvdata(pnp_dev, dev); 1028 pnp_set_drvdata(pnp_dev, dev);
1027 dev->pnp_dev = pnp_dev; 1029 dev->pnp_dev = pnp_dev;
@@ -1085,7 +1087,6 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
1085 goto exit_unregister_device; 1087 goto exit_unregister_device;
1086 } 1088 }
1087 1089
1088 dev->irq = pnp_irq(pnp_dev, 0);
1089 if (request_irq(dev->irq, ene_isr, 1090 if (request_irq(dev->irq, ene_isr,
1090 IRQF_SHARED, ENE_DRIVER_NAME, (void *)dev)) { 1091 IRQF_SHARED, ENE_DRIVER_NAME, (void *)dev)) {
1091 goto exit_release_hw_io; 1092 goto exit_release_hw_io;