summaryrefslogtreecommitdiffstats
path: root/drivers/media/common/siano
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2013-03-07 11:32:47 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-21 11:41:42 +0100
commit1e19c21ec7b5e66228602f4d88d894e23db1e004 (patch)
tree4a4817dd5ac6fde08d6b8e5ac66a233690579fa5 /drivers/media/common/siano
parent[media] siano: report the choosed firmware in debug (diff)
downloadlinux-1e19c21ec7b5e66228602f4d88d894e23db1e004.tar.xz
linux-1e19c21ec7b5e66228602f4d88d894e23db1e004.zip
[media] siano: fix the debug message
Instead of displaying this: [ 61.869415] smscore_load_firmware_family2: rc=0, postload=0x (null) Display, instead: [ 1348.441160] smscore_load_firmware_family2: rc=0 Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common/siano')
-rw-r--r--drivers/media/common/siano/smscoreapi.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/media/common/siano/smscoreapi.c b/drivers/media/common/siano/smscoreapi.c
index 5034153ed09c..7302f950c6bd 100644
--- a/drivers/media/common/siano/smscoreapi.c
+++ b/drivers/media/common/siano/smscoreapi.c
@@ -977,13 +977,16 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev,
msleep(400);
exit_fw_download:
- sms_debug("rc=%d, postload=0x%p ", rc, coredev->postload_handler);
-
kfree(msg);
- return ((rc >= 0) && coredev->postload_handler) ?
- coredev->postload_handler(coredev->context) :
- rc;
+ if (coredev->postload_handler) {
+ sms_debug("rc=%d, postload=0x%p", rc, coredev->postload_handler);
+ if (rc >= 0)
+ return coredev->postload_handler(coredev->context);
+ }
+
+ sms_debug("rc=%d", rc);
+ return rc;
}