CVS: The file 'linux/drivers/char/bluetooth/sdp.c' has been modified.

[Gordon M. <gm...@us...>]

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
sdp.c           1.71            1.72=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

--l2ca_disconnect_req will not return a negative value on all errors. On so=
me errors, such as an l2cap timeout, it returns a positive value. In the ca=
se of an l2cap timeout we don't want to sleep on the sdp_disc_wq since it's=
 likely we'll never wake up.


The diff of the modified file(s):

--- sdp.c	2001/03/30 12:09:30	1.71
+++ sdp.c	2001/04/17 00:56:11	1.72
@@ -751,7 +751,7 @@
 	/*-------------------------------------------------------------------*/
 	if (sdp_id <=3D MAX_NBR_SDP &&
 	    (sdp->state =3D=3D SDP_CONNECTING || sdp->state =3D=3D SDP_CONNECTED)=
) {
-		if ((err =3D l2ca_disconnect_req(sdp_con_list[sdp_id].l2cap)) < 0) {
+		if ((err =3D l2ca_disconnect_req(sdp_con_list[sdp_id].l2cap)) !=3D 0) {
 			D_ERR(__FUNCTION__ ", An error with error code %d occured duinr disconn=
etion of sdp channel %d\n", err, sdp_id);
 			sdp_con_list[sdp_id].state =3D SDP_DISCONNECTED;
 			sdp_con_list[sdp_id].l2cap =3D NULL;=20=20