From: Jérémy Lefaure Date: Wed, 15 Mar 2017 18:09:20 +0000 (-0400) Subject: staging: media: atomisp: fill properly hmm_bo_type_strings when ION is disabled X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fde469701c7efabebf885e785edf367bfb1a8f3f;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git staging: media: atomisp: fill properly hmm_bo_type_strings when ION is disabled When CONFIG_ION is disabled, HMM_BO_LAST is 3. In this case, "i" should not be added in hmm_bo_type_strings. Signed-off-by: Jérémy Lefaure Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c index a362b492ec8e..e78f02f74d0f 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c @@ -49,7 +49,9 @@ const char *hmm_bo_type_strings[HMM_BO_LAST] = { "p", /* private */ "s", /* shared */ "u", /* user */ +#ifdef CONFIG_ION "i", /* ion */ +#endif }; static ssize_t bo_show(struct device *dev, struct device_attribute *attr,