diff options
| author | Ingo Molnar | 2013-04-08 17:41:50 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2013-04-08 17:41:50 +0200 |
| commit | b6d5278dc8385eaf2e3904a4af444a04f6ae4e71 (patch) | |
| tree | 14e6031e0efa8e8b684db3b7ff85f8ac63ed0824 /net/irda/af_irda.c | |
| parent | x86, MCE, AMD: Use MCG_CAP MSR to find out number of banks on AMD (diff) | |
| parent | x86/mce: Rework cmci_rediscover() to play well with CPU hotplug (diff) | |
| download | kernel-qcow2-linux-b6d5278dc8385eaf2e3904a4af444a04f6ae4e71.tar.gz kernel-qcow2-linux-b6d5278dc8385eaf2e3904a4af444a04f6ae4e71.tar.xz kernel-qcow2-linux-b6d5278dc8385eaf2e3904a4af444a04f6ae4e71.zip | |
Merge tag 'please-pull-cmci_rediscover' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull clean up of the cmci_rediscover code to fix problems found by Dave Jones,
from Tony Luck.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/irda/af_irda.c')
| -rw-r--r-- | net/irda/af_irda.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index d07e3a626446..d28e7f014cc6 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -2583,8 +2583,10 @@ bed: NULL, NULL, NULL); /* Check if the we got some results */ - if (!self->cachedaddr) - return -EAGAIN; /* Didn't find any devices */ + if (!self->cachedaddr) { + err = -EAGAIN; /* Didn't find any devices */ + goto out; + } daddr = self->cachedaddr; /* Cleanup */ self->cachedaddr = 0; |