diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-24 02:17:25 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-24 02:17:25 -0400 |
| commit | a3d3362287fbe96fe90abdb5c6d1a35471129a8c (patch) | |
| tree | ad3c85ed1feef470c66599eb514e30f43c2db5dd /include/linux/err.h | |
| parent | fb7f045ace0624f1e59a7db8497e460bd54b1cbc (diff) | |
| parent | 4bbba111d94781d34081c37856bbc5eb33f6c72a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'include/linux/err.h')
| -rw-r--r-- | include/linux/err.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/err.h b/include/linux/err.h index 448afc12c78a..f2edce25a76b 100644 --- a/include/linux/err.h +++ b/include/linux/err.h | |||
| @@ -52,6 +52,14 @@ static inline void * __must_check ERR_CAST(const void *ptr) | |||
| 52 | return (void *) ptr; | 52 | return (void *) ptr; |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | static inline int __must_check PTR_RET(const void *ptr) | ||
| 56 | { | ||
| 57 | if (IS_ERR(ptr)) | ||
| 58 | return PTR_ERR(ptr); | ||
| 59 | else | ||
| 60 | return 0; | ||
| 61 | } | ||
| 62 | |||
| 55 | #endif | 63 | #endif |
| 56 | 64 | ||
| 57 | #endif /* _LINUX_ERR_H */ | 65 | #endif /* _LINUX_ERR_H */ |