| Message ID | 20200908140818.28373-1-jonathan@marek.ca (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 09309093d5e8f8774e4a3a0d42b73cf47e9421cf |
| Headers | show |
| Series | soundwire: qcom: fix SLIBMUS/SLIMBUS typo | expand |
On Tue 08 Sep 09:08 CDT 2020, Jonathan Marek wrote: > Fix slimbus case being broken thanks to a typo. > > Fixes: 5bd773242f75 ("soundwire: qcom: avoid dependency on CONFIG_SLIMBUS") > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> > Signed-off-by: Jonathan Marek <jonathan@marek.ca> > --- > This should be squashed into the problematic patch if possible, > but I'm not sure if that's possible since its already in linux-next? > > drivers/soundwire/qcom.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c > index 100af93a5eab..c406a079d237 100644 > --- a/drivers/soundwire/qcom.c > +++ b/drivers/soundwire/qcom.c > @@ -780,7 +780,7 @@ static int qcom_swrm_probe(struct platform_device *pdev) > if (!ctrl) > return -ENOMEM; > > -#if IS_ENABLED(CONFIG_SLIBMUS) > +#if IS_ENABLED(CONFIG_SLIMBUS) > if (dev->parent->bus == &slimbus_bus) { > #else > if (false) { > -- > 2.26.1 >
On 08-09-20, 10:08, Jonathan Marek wrote: > Fix slimbus case being broken thanks to a typo. > Applied, thanks > Fixes: 5bd773242f75 ("soundwire: qcom: avoid dependency on CONFIG_SLIMBUS") > No need of blank line here > Signed-off-by: Jonathan Marek <jonathan@marek.ca> > --- > This should be squashed into the problematic patch if possible, > but I'm not sure if that's possible since its already in linux-next? > > drivers/soundwire/qcom.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c > index 100af93a5eab..c406a079d237 100644 > --- a/drivers/soundwire/qcom.c > +++ b/drivers/soundwire/qcom.c > @@ -780,7 +780,7 @@ static int qcom_swrm_probe(struct platform_device *pdev) > if (!ctrl) > return -ENOMEM; > > -#if IS_ENABLED(CONFIG_SLIBMUS) > +#if IS_ENABLED(CONFIG_SLIMBUS) > if (dev->parent->bus == &slimbus_bus) { > #else > if (false) { > -- > 2.26.1
diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 100af93a5eab..c406a079d237 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -780,7 +780,7 @@ static int qcom_swrm_probe(struct platform_device *pdev) if (!ctrl) return -ENOMEM; -#if IS_ENABLED(CONFIG_SLIBMUS) +#if IS_ENABLED(CONFIG_SLIMBUS) if (dev->parent->bus == &slimbus_bus) { #else if (false) {
Fix slimbus case being broken thanks to a typo. Fixes: 5bd773242f75 ("soundwire: qcom: avoid dependency on CONFIG_SLIMBUS") Signed-off-by: Jonathan Marek <jonathan@marek.ca> --- This should be squashed into the problematic patch if possible, but I'm not sure if that's possible since its already in linux-next? drivers/soundwire/qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)