lkml.org 
[lkml]   [2010]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[158/205] isdn/capi: make reset_ctr op truly optional
    2.6.34-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Tilman Schmidt <tilman@imap.cc>

    commit 85a83560afa69862639fb2d6f670b4440a003335 upstream.

    The CAPI controller operation reset_ctr is marked as optional, and
    not all drivers do implement it. Add a check to the kernel CAPI
    whether it exists before trying to call it.

    Signed-off-by: Tilman Schmidt <tilman@imap.cc>
    Acked-by: Karsten Keil <isdn@linux-pingi.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/isdn/capi/kcapi.c | 6 ++++++
    1 file changed, 6 insertions(+)

    --- a/drivers/isdn/capi/kcapi.c
    +++ b/drivers/isdn/capi/kcapi.c
    @@ -1147,6 +1147,12 @@ load_unlock_out:
    if (ctr->state == CAPI_CTR_DETECTED)
    goto reset_unlock_out;

    + if (ctr->reset_ctr == NULL) {
    + printk(KERN_DEBUG "kcapi: reset: no reset function\n");
    + retval = -ESRCH;
    + goto reset_unlock_out;
    + }
    +
    ctr->reset_ctr(ctr);

    retval = wait_on_ctr_state(ctr, CAPI_CTR_DETECTED);



    \
     
     \ /
      Last update: 2010-07-30 20:15    [W:4.364 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site