From 0d188aca536284f3c9650d8857c43c0dd5a81c2c Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 16 May 2012 12:54:29 +0200 Subject: mfd mc13xxxx: Set mc_dev to NULL on failure The mc13xxx driver correctly bails out on failure, but leaves mc_dev initialized, so a later mc13xxx_get won't fail but returns an invalid pointer. Fix this. While at it, remove some superfluous code from mc13xxx_get. Signed-off-by: Sascha Hauer --- drivers/mfd/mc13xxx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/mfd/mc13xxx.c b/drivers/mfd/mc13xxx.c index ad7cb7eceb..f9477a3540 100644 --- a/drivers/mfd/mc13xxx.c +++ b/drivers/mfd/mc13xxx.c @@ -38,9 +38,6 @@ static struct mc13xxx *mc_dev; struct mc13xxx *mc13xxx_get(void) { - if (!mc_dev) - return NULL; - return mc_dev; } EXPORT_SYMBOL(mc13xxx_get); @@ -308,6 +305,7 @@ static int mc_probe(struct device_d *dev, enum mc13xxx_mode mode) rev = mc13xxx_query_revision(mc_dev); if (rev < 0) { free(mc_dev); + mc_dev = NULL; return -EINVAL; } -- cgit v1.2.3