fix issues with ene_ir driver (#664145)

This commit is contained in:
Kyle McMartin 2010-12-22 22:49:59 -05:00
parent 0cb25895ed
commit c60b83ee86
2 changed files with 21 additions and 1 deletions

View File

@ -48,7 +48,7 @@ Summary: The Linux kernel
# reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
# scripts/rebase.sh should be made to do that for you, actually.
#
%global baserelease 72
%global baserelease 73
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -2080,6 +2080,9 @@ fi
# and build.
%changelog
* Wed Dec 22 2010 Kyle McMartin <kyle@redhat.com> 2.6.35.10-73
- Fix ene_ir bugs (jumping off a null dev->rdev pointer) (#664145)
* Mon Dec 20 2010 Kyle McMartin <kyle@redhat.com> 2.6.35.10-72
- Backport some of the radeon r600_cs.c fixes between .35 and master. (#664206)

View File

@ -694,3 +694,20 @@ Index: linux-2.6.35.x86_64/drivers/media/rc/ene_ir.c
if (!pnp_port_valid(pnp_dev, 0) ||
pnp_port_len(pnp_dev, 0) < ENE_IO_SIZE)
goto error;
@@ -1076,6 +1076,8 @@ static int ene_probe(struct pnp_dev *pnp
rdev->input_name = "ENE eHome Infrared Remote Transceiver";
}
+ dev->rdev = rdev;
+
ene_rx_setup_hw_buffer(dev);
ene_setup_default_settings(dev);
ene_setup_hw_settings(dev);
@@ -1087,7 +1089,6 @@ static int ene_probe(struct pnp_dev *pnp
if (error < 0)
goto error;
- dev->rdev = rdev;
ene_notice("driver has been succesfully loaded");
return 0;
error: