From 4d1e8c6f6e3fd77b15f7ee2a84eec54150e5a61d Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Mon, 13 Aug 2018 14:46:10 +0000 Subject: [PATCH 6/6] uapi: fix linux/usb/audio.h userspace compilation errors Replace NULL with 0 in uac_mixer_unit_bmControls() and uac_processing_unit_bmControls() to fix the following linux/usb/audio.h userspace compilation errors: /usr/include/linux/usb/audio.h: In function 'uac_mixer_unit_bmControls': /usr/include/linux/usb/audio.h:304:10: error: 'NULL' undeclared (first use in this function) return NULL; /usr/include/linux/usb/audio.h: In function 'uac_processing_unit_bmControls': /usr/include/linux/usb/audio.h:416:10: error: 'NULL' undeclared (first use in this function) return NULL; Fixes: 6cfd839ae78e ("ALSA: usb-audio: UAC3. Add support for mixer unit.") Cc: # v4.18+ Signed-off-by: Dmitry V. Levin Link: https://lkml.kernel.org/r/20180813154651.GB22820@altlinux.org --- include/uapi/linux/usb/audio.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/usb/audio.h b/include/uapi/linux/usb/audio.h index c917c53070d5..e3bd2f01ad3e 100644 --- a/include/uapi/linux/usb/audio.h +++ b/include/uapi/linux/usb/audio.h @@ -301,7 +301,7 @@ static inline __u8 *uac_mixer_unit_bmControls(struct uac_mixer_unit_descriptor * case UAC_VERSION_3: return &desc->baSourceID[desc->bNrInPins + 2]; default: - return NULL; + return 0; } } @@ -413,7 +413,7 @@ static inline __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_de case UAC_VERSION_3: return &desc->baSourceID[desc->bNrInPins + 2]; default: - return NULL; + return 0; } }