Commit 7226d7c9 authored by Tilman Schmidt's avatar Tilman Schmidt Committed by David S. Miller

gigaset: fix error return code

gigaset_register_to_LL() is expected to print a message and return 0
on failure. Make it do so consistently.

Impact: error handling bugfix
Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1315d696
...@@ -544,11 +544,11 @@ int gigaset_register_to_LL(struct cardstate *cs, const char *isdnid) ...@@ -544,11 +544,11 @@ int gigaset_register_to_LL(struct cardstate *cs, const char *isdnid)
gig_dbg(DEBUG_ANY, "Register driver capabilities to LL"); gig_dbg(DEBUG_ANY, "Register driver capabilities to LL");
//iif->id[sizeof(iif->id) - 1]=0;
//strncpy(iif->id, isdnid, sizeof(iif->id) - 1);
if (snprintf(iif->id, sizeof iif->id, "%s_%u", isdnid, cs->minor_index) if (snprintf(iif->id, sizeof iif->id, "%s_%u", isdnid, cs->minor_index)
>= sizeof iif->id) >= sizeof iif->id) {
return -ENOMEM; //FIXME EINVAL/...?? pr_err("ID too long: %s\n", isdnid);
return 0;
}
iif->owner = THIS_MODULE; iif->owner = THIS_MODULE;
iif->channels = cs->channels; iif->channels = cs->channels;
...@@ -568,8 +568,10 @@ int gigaset_register_to_LL(struct cardstate *cs, const char *isdnid) ...@@ -568,8 +568,10 @@ int gigaset_register_to_LL(struct cardstate *cs, const char *isdnid)
iif->rcvcallb_skb = NULL; /* Will be set by LL */ iif->rcvcallb_skb = NULL; /* Will be set by LL */
iif->statcallb = NULL; /* Will be set by LL */ iif->statcallb = NULL; /* Will be set by LL */
if (!register_isdn(iif)) if (!register_isdn(iif)) {
pr_err("register_isdn failed\n");
return 0; return 0;
}
cs->myid = iif->channels; /* Set my device id */ cs->myid = iif->channels; /* Set my device id */
return 1; return 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment