Skip to content

Commit 156aa8a

Browse files
committed
Merge branch 'at91-5.4-trunk/wilc' into linux-5.4-at91
2 parents f936969 + a164825 commit 156aa8a

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

  • drivers/staging/wilc1000

drivers/staging/wilc1000/spi.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,8 @@ static int wilc_bus_probe(struct spi_device *spi)
137137
wilc->rtc_clk = devm_clk_get(&spi->dev, "rtc");
138138
if (PTR_ERR_OR_ZERO(wilc->rtc_clk) == -EPROBE_DEFER)
139139
goto netdev_cleanup;
140-
return -EPROBE_DEFER;
141-
} else if (!IS_ERR(wilc->rtc_clk)) {
140+
else if (!IS_ERR(wilc->rtc_clk))
142141
clk_prepare_enable(wilc->rtc_clk);
143-
}
144142

145143
ret = wilc_of_parse_power_pins(wilc);
146144
if (ret)

0 commit comments

Comments
 (0)