diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 14:12:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 14:12:44 -0700 |
| commit | c2f73fd07d2ce4605b404f34395eb734a7ba9967 (patch) | |
| tree | 4428204f4be7c7dfa55d674647c358ebc452063d /drivers/mmc/core/mmc.c | |
| parent | d20ead9e86881bc7ae84e385f47b5196b7d93aac (diff) | |
| parent | 727c26ed78b8f2b07452cf8bc9a07ff3f302ab48 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
net: libertas sdio driver
mmc: at91_mci: cleanup: use MCI_ERRORS
mmc: possible leak in mmc_read_ext_csd
Diffstat (limited to 'drivers/mmc/core/mmc.c')
| -rw-r--r-- | drivers/mmc/core/mmc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 65fe28860f5..68c0e3b2f0e 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -213,7 +213,8 @@ static int mmc_read_ext_csd(struct mmc_card *card) printk(KERN_ERR "%s: unrecognised EXT_CSD structure " "version %d\n", mmc_hostname(card->host), ext_csd_struct); - return -EINVAL; + err = -EINVAL; + goto out; } if (ext_csd_struct >= 2) { |