summaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2017-01-11 15:02:38 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2017-01-24 13:52:00 +0100
commit1e9bbb9bc2aa549d31fa0a0496ec33df0b3ae7a8 (patch)
tree079576501244483893ebf14042d88fbc1f556fed /drivers/net/can
parent431af779256cd6cb8328ac23c5696bae63c33a51 (diff)
downloadblackbird-obmc-linux-1e9bbb9bc2aa549d31fa0a0496ec33df0b3ae7a8.tar.gz
blackbird-obmc-linux-1e9bbb9bc2aa549d31fa0a0496ec33df0b3ae7a8.zip
can: softing_cs: ret is never non-zero, so remove non-zero check and -ENODEV return
The error return ret is never zero in the error handling path in softingcs_probe, so the check for non-zero and returning -ENODEV is logically dead code and hence redundant. Remove it and just return ret. Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can')
-rw-r--r--drivers/net/can/softing/softing_cs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c
index cdc0c7433a4b..4d4492884e0b 100644
--- a/drivers/net/can/softing/softing_cs.c
+++ b/drivers/net/can/softing/softing_cs.c
@@ -310,7 +310,7 @@ pcmcia_bad:
pcmcia_failed:
pcmcia_disable_device(pcmcia);
pcmcia->priv = NULL;
- return ret ?: -ENODEV;
+ return ret;
}
static const struct pcmcia_device_id softingcs_ids[] = {
OpenPOWER on IntegriCloud