From: nibble.max <nibble.max@gmail.com>
Date: Thu, 23 Oct 2014 13:36:49 +0000 (-0300)
Subject: [media] m88ts2022: return the err code in its probe function when error occurs
X-Git-Tag: v3.19-rc1~126^2~259
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4954578efb5fd91dd6432ecf7f04ba1b82a60693;p=karo-tx-linux.git

[media] m88ts2022: return the err code in its probe function when error occurs

if "chip_id" is wrong or "dev->cfg.clock_out" is invalid, the i2c model is still loaded.
It will cause "kernel NULL pointer dereference" oops when the i2c model remove.
returning the err code will prevent the i2c model load.

Signed-off-by: Nibble Max <nibble.max@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---

diff --git a/drivers/media/tuners/m88ts2022.c b/drivers/media/tuners/m88ts2022.c
index caa542346891..066e5431da93 100644
--- a/drivers/media/tuners/m88ts2022.c
+++ b/drivers/media/tuners/m88ts2022.c
@@ -488,6 +488,7 @@ static int m88ts2022_probe(struct i2c_client *client,
 	case 0x83:
 		break;
 	default:
+		ret = -ENODEV;
 		goto err;
 	}
 
@@ -505,6 +506,7 @@ static int m88ts2022_probe(struct i2c_client *client,
 		u8tmp = 0x6c;
 		break;
 	default:
+		ret = -EINVAL;
 		goto err;
 	}