diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-09 07:56:27 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-21 06:38:16 -0400 |
| commit | 7333839505d568e0e69a6d02a3ee0f455b6c37a5 (patch) | |
| tree | e2cf9cda6699c765b2f7bf50e85aa336fbf2f1f2 | |
| parent | 05f0ffbc487517a529c00119d0bfde33df509b52 (diff) | |
[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>
| -rw-r--r-- | drivers/media/common/siano/smscoreapi.c | 2 | ||||
| -rw-r--r-- | drivers/media/common/siano/smscoreapi.h | 1 |
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, | |||
| 1359 | coredev->mode = ver->FirmwareId == 255 ? | 1359 | coredev->mode = ver->FirmwareId == 255 ? |
| 1360 | DEVICE_MODE_NONE : ver->FirmwareId; | 1360 | DEVICE_MODE_NONE : ver->FirmwareId; |
| 1361 | coredev->modes_supported = ver->SupportedProtocols; | 1361 | coredev->modes_supported = ver->SupportedProtocols; |
| 1362 | coredev->fw_version = ver->RomVersionMajor << 8 | | ||
| 1363 | ver->RomVersionMinor; | ||
| 1362 | 1364 | ||
| 1363 | complete(&coredev->version_ex_done); | 1365 | complete(&coredev->version_ex_done); |
| 1364 | break; | 1366 | 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 { | |||
| 178 | /* Firmware */ | 178 | /* Firmware */ |
| 179 | u8 *fw_buf; | 179 | u8 *fw_buf; |
| 180 | u32 fw_buf_size; | 180 | u32 fw_buf_size; |
| 181 | u16 fw_version; | ||
| 181 | 182 | ||
| 182 | /* Infrared (IR) */ | 183 | /* Infrared (IR) */ |
| 183 | struct ir_t ir; | 184 | struct ir_t ir; |