lkml.org 
[lkml]   [2017]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 132/235] ser_gigaset: return -ENOMEM on error instead of success
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    [ Upstream commit 93a97c50cbf1c007caf12db5cc23e0d5b9c8473c ]

    If we can't allocate the resources in gigaset_initdriver() then we
    should return -ENOMEM instead of zero.

    Fixes: 2869b23e4b95 ("[PATCH] drivers/isdn/gigaset: new M101 driver (v2)")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/isdn/gigaset/ser-gigaset.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
    index 3ac9c4194814..53dfe1693e50 100644
    --- a/drivers/isdn/gigaset/ser-gigaset.c
    +++ b/drivers/isdn/gigaset/ser-gigaset.c
    @@ -787,8 +787,10 @@ static int __init ser_gigaset_init(void)
    driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
    GIGASET_MODULENAME, GIGASET_DEVNAME,
    &ops, THIS_MODULE);
    - if (!driver)
    + if (!driver) {
    + rc = -ENOMEM;
    goto error;
    + }

    rc = tty_register_ldisc(N_GIGASET_M101, &gigaset_ldisc);
    if (rc != 0) {
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-01-27 12:42    [W:3.939 / U:0.576 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site