summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-02-05 20:56:22 +0100
committerHans Verkuil <hverkuil@xs4all.nl>2007-02-05 20:56:22 +0100
commitcfdafbfa99ae8858be9853b49f8140d159c85d57 (patch)
treed58f6dd91c679d95852f8ffe500e4bfa0bf4b907 /linux
parent3316e866c007fc3d8dabdf63349f3d678c7805b1 (diff)
downloadmediapointer-dvb-s2-cfdafbfa99ae8858be9853b49f8140d159c85d57.tar.gz
mediapointer-dvb-s2-cfdafbfa99ae8858be9853b49f8140d159c85d57.tar.bz2
cx25840 request_firmware failed due to wrong device.
From: Hans Verkuil <hverkuil@xs4all.nl> Due to changes in the /sys directory structure a bug in the cx25840 firmware load surfaced in 2.6.20: the device passed to request_firmware was wrong: instead of the i2c device the i2c adapter was passed. Because of this an attemp was made to create a kobject with the adapter name inside the adapter directory, but a kobject with that name already exists. Now pass the i2c device itself so that the correct /sys directory is used. This way the firmware can be loaded again. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/cx25840/cx25840-firmware.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-firmware.c b/linux/drivers/media/video/cx25840/cx25840-firmware.c
index e14e0bc1f..1b730b155 100644
--- a/linux/drivers/media/video/cx25840/cx25840-firmware.c
+++ b/linux/drivers/media/video/cx25840/cx25840-firmware.c
@@ -39,7 +39,7 @@
#define FWSEND 48
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
-#define FWDEV(x) &((x)->adapter->dev)
+#define FWDEV(x) &((x)->dev)
#else
#define FWDEV(x) (x)->name
#endif