Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gigaset: fix error return code

Browse source 
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: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tilman Schmidt 2009-05-13 12:44:17 +00:00 committed by David S. Miller
parent 1315d69634
commit 7226d7c960
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/isdn/gigaset/i4l.c
View file

@ -544,11 +544,11 @@ int gigaset_register_to_LL(struct cardstate *cs, const char *isdnid)
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)
>= sizeof iif->id)
return -ENOMEM; //FIXME EINVAL/...??
>= sizeof iif->id) {
pr_err("ID too long: %s\n", isdnid);
return 0;
}
iif->owner = THIS_MODULE;
iif->channels = cs->channels;
@ -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->statcallb = NULL; /* Will be set by LL */
if (!register_isdn(iif))
if (!register_isdn(iif)) {
pr_err("register_isdn failed\n");
return 0;
}
cs->myid = iif->channels; /* Set my device id */
return 1;