[Patches] dvb_ca_en50221: fix use count, error code

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

Marco Schluessler sent me patches which fix two bugs in dvb_ca_en50221:
- decrement module use count on error
- return correct error code value

If no one objects I'll commit them.

CU
Oliver

-- 
----------------------------------------------------------------
VDR Remote Plugin 0.3.9: http://www.escape-edv.de/endriss/vdr/
----------------------------------------------------------------
- return correct error code value

Signed-off-by: Marco Schluessler <marco@xxxxxxxxxxxxx>

diff -bur v4l-dvb-96c5b8101ea3_orig/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c v4l-dvb-96c5b8101ea3/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
--- v4l-dvb-96c5b8101ea3_orig/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2007-08-17 21:05:15.000000000 +0200
+++ v4l-dvb-96c5b8101ea3/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2007-08-18 00:34:14.000000000 +0200
@@ -1570,7 +1570,7 @@
 {
 	struct dvb_device *dvbdev = file->private_data;
 	struct dvb_ca_private *ca = dvbdev->priv;
-	int err = 0;
+	int err;
 
 	dprintk("%s\n", __FUNCTION__);
 
@@ -1582,7 +1582,7 @@
 
 	module_put(ca->pub->owner);
 
-	return 0;
+	return err;
 }
 
 
- decrement module use count on error

Signed-off-by: Marco Schluessler <marco@xxxxxxxxxxxxx>

diff -bur v4l-dvb-96c5b8101ea3_orig/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c v4l-dvb-96c5b8101ea3/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
--- v4l-dvb-96c5b8101ea3_orig/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2007-08-17 21:05:15.000000000 +0200
+++ v4l-dvb-96c5b8101ea3/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2007-08-18 00:16:24.000000000 +0200
@@ -1536,8 +1536,10 @@
 		return -EIO;
 
 	err = dvb_generic_open(inode, file);
-	if (err < 0)
+	if (err < 0) {
+		module_put(ca->pub->owner);
 		return err;
+	}
 
 	for (i = 0; i < ca->slot_count; i++) {
 
_______________________________________________
linux-dvb mailing list
linux-dvb@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb

[Index of Archives]     [Linux Media]     [Video 4 Linux]     [Asterisk]     [Samba]     [Xorg]     [Xfree86]     [Linux USB]

  Powered by Linux