Re: [PATCH 07/13] spi: cadence-qspi: Fix probe error path and remove

[Miquel Raynal]

Hi Geert,

>> @@ -1995,7 +1995,7 @@ static int cqspi_probe(struct platform_device *pdev)
>>         ret = cqspi_setup_flash(cqspi);
>>         if (ret) {
>>                 dev_err(dev, "failed to setup flash parameters %d\n", ret);
>> -               goto probe_setup_failed;
>> +               goto disable_controller;
>
> FTR, this conflicts with commit 9f0736a4e136a6eb ("spi: cadence-quadspi:
> Parse DT for flashes with the rest of the DT parsing") in
> spi/for-next.

Ugh. I got conflicts on 3 or 4 patches after rebasing on top of
spi/for-next. Thanks for the heads up.

Miquèl