Skip to content

spi: dw: Fix duplicate if block in dw_spi_transfer_one #7465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelwell merged 1 commit into from
Jun 30, 2026
+1 −7
Merged

spi: dw: Fix duplicate if block in dw_spi_transfer_one #7465

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions drivers/spi/spi-dw-core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,13 +503,7 @@ static int dw_spi_transfer_one(struct spi_controller *host,
if (!dws->rx) {
dws->rx_len = 0;
cfg.tmode = DW_SPI_CTRLR0_TMOD_TO;
}

if (!dws->rx) {
dws->rx_len = 0;
cfg.tmode = DW_SPI_CTRLR0_TMOD_TO;
}
if (!dws->tx) {
} else if (!dws->tx) {

@popcornmix popcornmix Jun 30, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the added else here changes behaviour. Was that intended?

@martamomotko martamomotko Jun 30, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, as Phil stated, I think these are mutually exclusive events

@pelwell pelwell Jun 30, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The switch to using an else is actually a change in behaviour - previously it was possible to enter the bodies of both if statements (if neither tx nor rx were set), but that's probably not possible (and certainly not useful) in reality. This way probably makes more sense.

dws->tx_len = 0;
cfg.tmode = DW_SPI_CTRLR0_TMOD_RO;
cfg.ndf = dws->rx_len;
Expand Down
Loading