diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-16 20:23:44 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-16 20:23:44 +0200 |
| commit | e741110f5a4089f22dbaae97443753acd4851bdd (patch) | |
| tree | 86acf2e6c390d633da5be4a4ea4e1c6d024c4bec /drivers | |
| parent | 9115339720c3df3c9b40dae7adbef137362efcc0 (diff) | |
| parent | 0d188aca536284f3c9650d8857c43c0dd5a81c2c (diff) | |
| download | barebox-e741110f5a4089f22dbaae97443753acd4851bdd.tar.gz barebox-e741110f5a4089f22dbaae97443753acd4851bdd.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/mc13xxx.c | 4 |
1 files changed, 1 insertions, 3 deletions
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; } |