diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:40:58 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:40:58 -0500 |
commit | 9afa3195b96da7d2320ec44d19fbfbded7a15571 (patch) | |
tree | 15c4222de2a2b2814c9430dcb4e997b18597881c /drivers/pcmcia | |
parent | 7c2db36e730ee4facd341679ecb21ee73ba92831 (diff) | |
parent | df63447f1a4402d7d9c6a9cd1c39a6d6766452d1 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Assorted tiny fixes queued in trivial tree"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (22 commits)
DocBook: update EXPORT_SYMBOL entry to point at export.h
Documentation: update top level 00-INDEX file with new additions
ARM: at91/ide: remove unsused at91-ide Kconfig entry
percpu_counter.h: comment code for better readability
x86, efi: fix comment typo in head_32.S
IB: cxgb3: delay freeing mem untill entirely done with it
net: mvneta: remove unneeded version.h include
time: x86: report_lost_ticks doesn't exist any more
pcmcia: avoid static analysis complaint about use-after-free
fs/jfs: Fix typo in comment : 'how may' -> 'how many'
of: add missing documentation for of_platform_populate()
btrfs: remove unnecessary cur_trans set before goto loop in join_transaction
sound: soc: Fix typo in sound/codecs
treewide: Fix typo in various drivers
btrfs: fix comment typos
Update ibmvscsi module name in Kconfig.
powerpc: fix typo (utilties -> utilities)
of: fix spelling mistake in comment
h8300: Fix home page URL in h8300/README
xtensa: Fix home page URL in Kconfig
...
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r-- | drivers/pcmcia/rsrc_nonstatic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c index 430a9ac56091..065704c605d5 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c | |||
@@ -369,12 +369,12 @@ static int do_validate_mem(struct pcmcia_socket *s, | |||
369 | } | 369 | } |
370 | } | 370 | } |
371 | 371 | ||
372 | free_region(res2); | ||
373 | free_region(res1); | ||
374 | |||
375 | dev_dbg(&s->dev, "cs: memory probe 0x%06lx-0x%06lx: %p %p %u %u %u", | 372 | dev_dbg(&s->dev, "cs: memory probe 0x%06lx-0x%06lx: %p %p %u %u %u", |
376 | base, base+size-1, res1, res2, ret, info1, info2); | 373 | base, base+size-1, res1, res2, ret, info1, info2); |
377 | 374 | ||
375 | free_region(res2); | ||
376 | free_region(res1); | ||
377 | |||
378 | if ((ret) || (info1 != info2) || (info1 == 0)) | 378 | if ((ret) || (info1 != info2) || (info1 == 0)) |
379 | return -EINVAL; | 379 | return -EINVAL; |
380 | 380 | ||