[PATCH] ISDN: don't unlock lp if there is nothing to unlock

Patrick McHardy (kaber@trash.net)
Fri, 21 Mar 2003 20:06:35 +0100


This is a MIME-formatted message. If you see this text it means that your
E-mail software does not support MIME-formatted messages.

--=_courier-6560-1048274443-0001-2
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

This patch fixes a bug introduced with 2.4.20, it is tried to unlock
lp after failed call to isdn_net_get_locked_lp.

Regards,
Patrick

--=_courier-6560-1048274443-0001-2
Content-Type: text/plain; name="isdn-ppp-dont-unlock.diff"; charset=iso-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="isdn-ppp-dont-unlock.diff"

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1104 -> 1.1105
# drivers/isdn/isdn_ppp.c 1.21 -> 1.22
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/03/21 kaber@trash.net 1.1105
# [ISDN]: don't try to unlock when there is nothing to unlock
# --------------------------------------------
#
diff -Nru a/drivers/isdn/isdn_ppp.c b/drivers/isdn/isdn_ppp.c
--- a/drivers/isdn/isdn_ppp.c Fri Mar 21 19:53:58 2003
+++ b/drivers/isdn/isdn_ppp.c Fri Mar 21 19:53:58 2003
@@ -1251,7 +1251,7 @@
if (!lp) {
printk(KERN_WARNING "%s: all channels busy - requeuing!\n", netdev->name);
retval = 1;
- goto unlock;
+ goto out;
}
/* we have our lp locked from now on */

--=_courier-6560-1048274443-0001-2--