diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2022-01-09 16:59:30 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-01-09 17:00:17 -0800 |
| commit | 8aaaf2f3af2ae212428f4db1af34214225f5cec3 (patch) | |
| tree | 43c7f4f8af2fad7919f169b0924dba5e43147d97 /drivers/net/can/softing | |
| parent | tcp: tcp_send_challenge_ack delete useless param `skb` (diff) | |
| parent | amt: fix wrong return type of amt_send_membership_update() (diff) | |
| download | linux-dev-8aaaf2f3af2ae212428f4db1af34214225f5cec3.tar.xz linux-dev-8aaaf2f3af2ae212428f4db1af34214225f5cec3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in fixes directly in prep for the 5.17 merge window.
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/can/softing')
| -rw-r--r-- | drivers/net/can/softing/softing_cs.c | 2 | ||||
| -rw-r--r-- | drivers/net/can/softing/softing_fw.c | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c index 2e93ee792373..e5c939b63fa6 100644 --- a/drivers/net/can/softing/softing_cs.c +++ b/drivers/net/can/softing/softing_cs.c @@ -293,7 +293,7 @@ static int softingcs_probe(struct pcmcia_device *pcmcia) return 0; platform_failed: - kfree(dev); + platform_device_put(pdev); mem_failed: pcmcia_bad: pcmcia_failed: diff --git a/drivers/net/can/softing/softing_fw.c b/drivers/net/can/softing/softing_fw.c index 7e1536877993..32286f861a19 100644 --- a/drivers/net/can/softing/softing_fw.c +++ b/drivers/net/can/softing/softing_fw.c @@ -565,18 +565,19 @@ int softing_startstop(struct net_device *dev, int up) if (ret < 0) goto failed; } - /* enable_error_frame */ - /* + + /* enable_error_frame + * * Error reporting is switched off at the moment since * the receiving of them is not yet 100% verified * This should be enabled sooner or later - * - if (error_reporting) { + */ + if (0 && error_reporting) { ret = softing_fct_cmd(card, 51, "enable_error_frame"); if (ret < 0) goto failed; } - */ + /* initialize interface */ iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 2]); iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 4]); |