Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01a85901 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller
Browse files

caif: checking the wrong variable 



In the original code we check if (servl == NULL) twice.  The first time
should print the message that cfmuxl_remove_uplayer() failed and set
"ret" correctly, but instead it just returns success.  The second check
should be checking the value of "ret" instead of "servl".

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Acked-by: default avatarSjur Braendeland <sjur.brandeland@stericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5e507328

net/caif/cfcnfg.c

+5 −4
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ int cfcnfg_disconn_adapt_layer(struct cfcnfg *cnfg, struct cflayer *adap_layer) 
	struct cflayer *servl = NULL;

	struct cfcnfg_phyinfo *phyinfo = NULL;

	u8 phyid = 0;



	caif_assert(adap_layer != NULL);

	channel_id = adap_layer->id;

	if (adap_layer->dn == NULL || channel_id == 0) {
@@ -199,16 +200,16 @@ int cfcnfg_disconn_adapt_layer(struct cfcnfg *cnfg, struct cflayer *adap_layer) 
		goto end;

	}

	servl = cfmuxl_remove_uplayer(cnfg->mux, channel_id);

	if (servl == NULL)

		goto end;

	layer_set_up(servl, NULL);

	ret = cfctrl_linkdown_req(cnfg->ctrl, channel_id, adap_layer);

	if (servl == NULL) {

		pr_err("PROTOCOL ERROR - Error removing service_layer Channel_Id(%d)",

		       channel_id);

		ret = -EINVAL;

		goto end;

	}

	layer_set_up(servl, NULL);

	ret = cfctrl_linkdown_req(cnfg->ctrl, channel_id, adap_layer);

	if (ret)

		goto end;

	caif_assert(channel_id == servl->id);

	if (adap_layer->dn != NULL) {

		phyid = cfsrvl_getphyid(adap_layer->dn);