diff mbox series

spi: spl022: fix Microwire full duplex mode

Message ID 20211022142104.1386379-1-thomas.perrot@bootlin.com (mailing list archive)
State Accepted
Commit d81d0e41ed5fe7229a2c9a29d13bad288c7cf2d2
Headers show
Series spi: spl022: fix Microwire full duplex mode | expand

Commit Message

Thomas Perrot Oct. 22, 2021, 2:21 p.m. UTC
There are missing braces in the function that verify controller parameters,
then an error is always returned when the parameter to select Microwire
frames operation is used on devices allowing it.

Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com>
---
 drivers/spi/spi-pl022.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Greg KH Oct. 22, 2021, 2:34 p.m. UTC | #1
On Fri, Oct 22, 2021 at 04:21:04PM +0200, Thomas Perrot wrote:
> There are missing braces in the function that verify controller parameters,
> then an error is always returned when the parameter to select Microwire
> frames operation is used on devices allowing it.
> 
> Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com>
> ---
>  drivers/spi/spi-pl022.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
> index feebda66f56e..e4484ace584e 100644
> --- a/drivers/spi/spi-pl022.c
> +++ b/drivers/spi/spi-pl022.c
> @@ -1716,12 +1716,13 @@ static int verify_controller_parameters(struct pl022 *pl022,
>  				return -EINVAL;
>  			}
>  		} else {
> -			if (chip_info->duplex != SSP_MICROWIRE_CHANNEL_FULL_DUPLEX)
> +			if (chip_info->duplex != SSP_MICROWIRE_CHANNEL_FULL_DUPLEX) {
>  				dev_err(&pl022->adev->dev,
>  					"Microwire half duplex mode requested,"
>  					" but this is only available in the"
>  					" ST version of PL022\n");
> -			return -EINVAL;
> +				return -EINVAL;
> +			}
>  		}
>  	}
>  	return 0;
> -- 
> 2.31.1
> 

<formletter>

This is not the correct way to submit patches for inclusion in the
stable kernel tree.  Please read:
    https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.

</formletter>
Mark Brown Oct. 23, 2021, 11:32 a.m. UTC | #2
On Fri, 22 Oct 2021 16:21:04 +0200, Thomas Perrot wrote:
> There are missing braces in the function that verify controller parameters,
> then an error is always returned when the parameter to select Microwire
> frames operation is used on devices allowing it.
> 
> 

Applied to

   broonie/spi.git for-next

Thanks!

[1/1] spi: spl022: fix Microwire full duplex mode
      commit: 992ed0c72eb9c459c402205ce274904ea789a780

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index feebda66f56e..e4484ace584e 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -1716,12 +1716,13 @@  static int verify_controller_parameters(struct pl022 *pl022,
 				return -EINVAL;
 			}
 		} else {
-			if (chip_info->duplex != SSP_MICROWIRE_CHANNEL_FULL_DUPLEX)
+			if (chip_info->duplex != SSP_MICROWIRE_CHANNEL_FULL_DUPLEX) {
 				dev_err(&pl022->adev->dev,
 					"Microwire half duplex mode requested,"
 					" but this is only available in the"
 					" ST version of PL022\n");
-			return -EINVAL;
+				return -EINVAL;
+			}
 		}
 	}
 	return 0;