summaryrefslogtreecommitdiffstats
path: root/drivers/media/common
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2013-03-09 09:56:27 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-21 07:38:16 -0300
commit7333839505d568e0e69a6d02a3ee0f455b6c37a5 (patch)
treee2cf9cda6699c765b2f7bf50e85aa336fbf2f1f2 /drivers/media/common
parent05f0ffbc487517a529c00119d0bfde33df509b52 (diff)
downloadlinux-7333839505d568e0e69a6d02a3ee0f455b6c37a5.tar.gz
linux-7333839505d568e0e69a6d02a3ee0f455b6c37a5.tar.bz2
linux-7333839505d568e0e69a6d02a3ee0f455b6c37a5.zip
[media] siano: store firmware version
As there are some changes that seem to be firmware-dependent, we need to store the firmware version, as we don't want to break support for existing cards that use a legacy (and sometimes custom) firmware. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common')
-rw-r--r--drivers/media/common/siano/smscoreapi.c2
-rw-r--r--drivers/media/common/siano/smscoreapi.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/common/siano/smscoreapi.c b/drivers/media/common/siano/smscoreapi.c
index 1dab4b64d395..7b5d81a30cdf 100644
--- a/drivers/media/common/siano/smscoreapi.c
+++ b/drivers/media/common/siano/smscoreapi.c
@@ -1359,6 +1359,8 @@ void smscore_onresponse(struct smscore_device_t *coredev,
coredev->mode = ver->FirmwareId == 255 ?
DEVICE_MODE_NONE : ver->FirmwareId;
coredev->modes_supported = ver->SupportedProtocols;
+ coredev->fw_version = ver->RomVersionMajor << 8 |
+ ver->RomVersionMinor;
complete(&coredev->version_ex_done);
break;
diff --git a/drivers/media/common/siano/smscoreapi.h b/drivers/media/common/siano/smscoreapi.h
index fc451e206436..f1440a55cb4d 100644
--- a/drivers/media/common/siano/smscoreapi.h
+++ b/drivers/media/common/siano/smscoreapi.h
@@ -178,6 +178,7 @@ struct smscore_device_t {
/* Firmware */
u8 *fw_buf;
u32 fw_buf_size;
+ u16 fw_version;
/* Infrared (IR) */
struct ir_t ir;