lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] rc/ene_ir: fix oops on module load

Browse Source 
dev->rdev is accessed in ene_setup_hw_settings, so it needs to be wired
up before then.

[Jarod Wilson]: Also fix a possible improper resource freeing bug while
we're looking at possible probe issues here.

Signed-off-by: Kyle McMartin <kmcmartin@redhat.com>
CC: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Kyle McMartin
2011-01-06 16:59:33 -03:00
committed by Mauro Carvalho Chehab
parent 7d2edfc23e
commit 2e4c55626a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/rc/ene_ir.c
View File

@@ -1004,6 +1004,10 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
/* validate resources */ /* validate resources */
error = -ENODEV; error = -ENODEV;
/* init these to -1, as 0 is valid for both */
dev->hw_io = -1;
dev->irq = -1;
if (!pnp_port_valid(pnp_dev, 0) || if (!pnp_port_valid(pnp_dev, 0) ||
pnp_port_len(pnp_dev, 0) < ENE_IO_SIZE) pnp_port_len(pnp_dev, 0) < ENE_IO_SIZE)
goto error; goto error;
@@ -1072,6 +1076,8 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
rdev->input_name = "ENE eHome Infrared Remote Transceiver"; rdev->input_name = "ENE eHome Infrared Remote Transceiver";
} }
dev->rdev = rdev;
ene_rx_setup_hw_buffer(dev); ene_rx_setup_hw_buffer(dev);
ene_setup_default_settings(dev); ene_setup_default_settings(dev);
ene_setup_hw_settings(dev); ene_setup_hw_settings(dev);
@@ -1083,7 +1089,6 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
if (error < 0) if (error < 0)
goto error; goto error;
dev->rdev = rdev;
ene_notice("driver has been succesfully loaded"); ene_notice("driver has been succesfully loaded");
return 0; return 0;
error: error: