patch-2.1.31 linux/drivers/char/apm_bios.c

Next file: linux/drivers/char/atarimouse.c
Previous file: linux/drivers/char/amigamouse.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.30/linux/drivers/char/apm_bios.c linux/drivers/char/apm_bios.c
@@ -301,7 +301,7 @@
 static void	do_apm_timer(unsigned long);
 
 static int	do_open(struct inode *, struct file *);
-static void	do_release(struct inode *, struct file *);
+static int	do_release(struct inode *, struct file *);
 static long	do_read(struct inode *, struct file *, char *, unsigned long);
 static unsigned int do_poll(struct file *, poll_table *);
 static int	do_ioctl(struct inode *, struct file *, u_int, u_long);
@@ -911,14 +911,14 @@
 	return 0;
 }
 
-static void do_release(struct inode * inode, struct file * filp)
+static int do_release(struct inode * inode, struct file * filp)
 {
 	struct apm_bios_struct *	as;
 
 	as = filp->private_data;
 	filp->private_data = NULL;
 	if (check_apm_bios_struct(as, "release"))
-		return;
+		return 0;
 	if (as->standbys_pending > 0) {
 		standbys_pending -= as->standbys_pending;
 		if (standbys_pending <= 0)
@@ -944,6 +944,7 @@
 			as1->next = as->next;
 	}
 	kfree_s(as, sizeof(*as));
+	return 0;
 }
 
 static int do_open(struct inode * inode, struct file * filp)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov