[PATCH v2 10/26] media: xc4000: don't ignore error if hwmodel fails

[Mauro Carvalho Chehab]

If, for some reason, reading the hwmodel register on
xc4000 fails, it will cause the following logig to
use a random value, as reported by smatch:

        drivers/media/tuners/xc4000.c:1047 check_firmware() error: 
uninitialized symbol 'hwmodel'.
        drivers/media/tuners/xc4000.c:1060 check_firmware() error: 
uninitialized symbol 'hwmodel'.
        drivers/media/tuners/xc4000.c:1064 check_firmware() error: 
uninitialized symbol 'hwmodel'.

Signed-off-by: Mauro Carvalho Chehab <mche...@s-opensource.com>
---
 drivers/media/tuners/xc4000.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/media/tuners/xc4000.c b/drivers/media/tuners/xc4000.c
index e30948e4ff87..2113ce594f75 100644
--- a/drivers/media/tuners/xc4000.c
+++ b/drivers/media/tuners/xc4000.c
@@ -1036,7 +1036,10 @@ static int check_firmware(struct dvb_frontend *fe, 
unsigned int type,
                dprintk(1, "load scode failed %d\n", rc);
 
 check_device:
-       rc = xc4000_readreg(priv, XREG_PRODUCT_ID, &hwmodel);
+       if (xc4000_readreg(priv, XREG_PRODUCT_ID, &hwmodel) < 0) {
+               printk(KERN_ERR "Unable to read tuner registers.\n");
+               goto fail;
+       }
 
        if (xc_get_version(priv, &hw_major, &hw_minor, &fw_major,
                           &fw_minor) != 0) {
-- 
2.13.6