Commit b31b0219 authored Jun 19, 2012 by Luis Henriques Committed by Mauro Carvalho Chehab Jul 05, 2012

[media] ene_ir: Fix driver initialisation



commit 9ef449c6 ("[media] rc: Postpone ISR
registration") fixed an early ISR registration on several drivers.  It did
however also introduced a bug by moving the invocation of pnp_port_start()
to the end of the probe function.

This patch fixes this issue by moving the invocation of pnp_port_start() to
an earlier stage in the probe function.

Cc: stable@vger.kernel.org
Cc: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 1d432a3d

drivers/media/rc/ene_ir.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1018,6 +1018,8 @@ static int ene_probe(struct pnp_dev pnp_dev, const struct pnp_device_id id)

		spin_lock_init(&dev->hw_lock);

		dev->hw_io = pnp_port_start(pnp_dev, 0);

		pnp_set_drvdata(pnp_dev, dev);
		dev->pnp_dev = pnp_dev;

		@@ -1072,7 +1074,6 @@ static int ene_probe(struct pnp_dev pnp_dev, const struct pnp_device_id id)

		/* claim the resources */
		error = -EBUSY;
		dev->hw_io = pnp_port_start(pnp_dev, 0);
		if (!request_region(dev->hw_io, ENE_IO_SIZE, ENE_DRIVER_NAME)) {
		dev->hw_io = -1;
		dev->irq = -1;