diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-15 12:04:28 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-15 12:04:28 +0200 |
| commit | 870ba597a3efac91d4dd8603d9c228f262603728 (patch) | |
| tree | 947a5b88f0591a7e79c0d4a5ee732f8ba3188dcb | |
| parent | 931e7358911ab018ba02c1fe1937cdf808a4022a (diff) | |
| parent | 70f7321dc03eb181d1b2ae1365bcfb630f59885c (diff) | |
| download | alsa-driver-build-unstable-870ba597a3efac91d4dd8603d9c228f262603728.tar.gz | |
Merge remote-tracking branch 'stable/build' into build
| -rw-r--r-- | alsa/include/adriver.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/alsa/include/adriver.h b/alsa/include/adriver.h index 8d7510a3e..aee31d870 100644 --- a/alsa/include/adriver.h +++ b/alsa/include/adriver.h @@ -1855,4 +1855,8 @@ static inline int sysfs_create_groups(struct kobject *kobj, #endif #endif /* < 3.5.0 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) +#define PTR_ERR_OR_ZERO(p) PTR_RET(p) +#endif /* < 3.12 */ + #endif /* __SOUND_LOCAL_DRIVER_H */ |