diff options
author | Roberto Alcântara <roberto@eletronica.org> | 2013-05-11 10:53:29 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-05-21 08:05:38 -0400 |
commit | 4c8d558a1403cedd465395d719d13778b0f689f2 (patch) | |
tree | d7d874d66ac4f81c6611cc00326e6cf5d68acdeb /drivers/media/common | |
parent | a242f426108c284049a69710f871cc9f11b13e61 (diff) |
[media] smscoreapi: Make Siano firmware load more verbose
If firmware load fails, report it as an error.
Signed-off-by: Roberto Alcantara <roberto@eletronica.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common')
-rw-r--r-- | drivers/media/common/siano/smscoreapi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/common/siano/smscoreapi.c b/drivers/media/common/siano/smscoreapi.c index 45ac9eea4882..dbe9b4d9b799 100644 --- a/drivers/media/common/siano/smscoreapi.c +++ b/drivers/media/common/siano/smscoreapi.c | |||
@@ -1154,7 +1154,7 @@ static int smscore_load_firmware_from_file(struct smscore_device_t *coredev, | |||
1154 | 1154 | ||
1155 | char *fw_filename = smscore_get_fw_filename(coredev, mode); | 1155 | char *fw_filename = smscore_get_fw_filename(coredev, mode); |
1156 | if (!fw_filename) { | 1156 | if (!fw_filename) { |
1157 | sms_info("mode %d not supported on this device", mode); | 1157 | sms_err("mode %d not supported on this device", mode); |
1158 | return -ENOENT; | 1158 | return -ENOENT; |
1159 | } | 1159 | } |
1160 | sms_debug("Firmware name: %s", fw_filename); | 1160 | sms_debug("Firmware name: %s", fw_filename); |
@@ -1165,14 +1165,14 @@ static int smscore_load_firmware_from_file(struct smscore_device_t *coredev, | |||
1165 | 1165 | ||
1166 | rc = request_firmware(&fw, fw_filename, coredev->device); | 1166 | rc = request_firmware(&fw, fw_filename, coredev->device); |
1167 | if (rc < 0) { | 1167 | if (rc < 0) { |
1168 | sms_info("failed to open \"%s\"", fw_filename); | 1168 | sms_err("failed to open firmware file \"%s\"", fw_filename); |
1169 | return rc; | 1169 | return rc; |
1170 | } | 1170 | } |
1171 | sms_info("read fw %s, buffer size=0x%zx", fw_filename, fw->size); | 1171 | sms_info("read fw %s, buffer size=0x%zx", fw_filename, fw->size); |
1172 | fw_buf = kmalloc(ALIGN(fw->size, SMS_ALLOC_ALIGNMENT), | 1172 | fw_buf = kmalloc(ALIGN(fw->size, SMS_ALLOC_ALIGNMENT), |
1173 | GFP_KERNEL | GFP_DMA); | 1173 | GFP_KERNEL | GFP_DMA); |
1174 | if (!fw_buf) { | 1174 | if (!fw_buf) { |
1175 | sms_info("failed to allocate firmware buffer"); | 1175 | sms_err("failed to allocate firmware buffer"); |
1176 | return -ENOMEM; | 1176 | return -ENOMEM; |
1177 | } | 1177 | } |
1178 | memcpy(fw_buf, fw->data, fw->size); | 1178 | memcpy(fw_buf, fw->data, fw->size); |