diff --git a/[refs] b/[refs] index 7ef190988a1f..1aa24af7a184 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb59a4c539140592723e806e852ee171da0eb3eb +refs/heads/master: 4d9db977f9ac9b15f916888978026025c6cf9563 diff --git a/trunk/drivers/staging/lirc/lirc_sasem.c b/trunk/drivers/staging/lirc/lirc_sasem.c index 73166c3f581f..856487eecd24 100644 --- a/trunk/drivers/staging/lirc/lirc_sasem.c +++ b/trunk/drivers/staging/lirc/lirc_sasem.c @@ -512,7 +512,7 @@ static int ir_open(void *data) mutex_unlock(&context->ctx_lock); mutex_unlock(&disconnect_lock); - return 0; + return retval; } /** diff --git a/trunk/drivers/staging/vt6655/iwctl.c b/trunk/drivers/staging/vt6655/iwctl.c index 43227617aabe..4009c0b5bb27 100644 --- a/trunk/drivers/staging/vt6655/iwctl.c +++ b/trunk/drivers/staging/vt6655/iwctl.c @@ -1900,7 +1900,7 @@ int iwctl_siwgenie(struct net_device *dev, } out://not completely ...not necessary in wpa_supplicant 0.5.8 - return 0; + return ret; } int iwctl_giwgenie(struct net_device *dev, diff --git a/trunk/drivers/staging/vt6656/iwctl.c b/trunk/drivers/staging/vt6656/iwctl.c index 9c855f0ffced..0004be8e3957 100644 --- a/trunk/drivers/staging/vt6656/iwctl.c +++ b/trunk/drivers/staging/vt6656/iwctl.c @@ -1719,7 +1719,7 @@ int iwctl_siwgenie(struct net_device *dev, } out://not completely ...not necessary in wpa_supplicant 0.5.8 - return 0; + return ret; } int iwctl_giwgenie(struct net_device *dev,