patch-2.4.0-test5 linux/drivers/telephony/phonedev.c

• Lines: 36
• Date: Mon Jul 24 17:04:12 2000
• Orig file: v2.4.0-test4/linux/drivers/telephony/phonedev.c
• Orig date: Fri Jun 23 21:55:10 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/telephony/phonedev.c linux/drivers/telephony/phonedev.c
@@ -49,14 +49,16 @@
 	unsigned int minor = MINOR(inode->i_rdev);
 	int err = 0;
 	struct phone_device *p;
-	struct file_operations *old_fops;
+	struct file_operations *old_fops, *new_fops = NULL;
 
 	if (minor >= PHONE_NUM_DEVICES)
 		return -ENODEV;
 
 	down(&phone_lock);
 	p = phone_device[minor];
-	if (p == NULL) {
+	if (p)
+		new_fops = fops_get(p->f_op);
+	if (!new_fops) {
 		char modname[32];
 
 		up(&phone_lock);
@@ -64,14 +66,14 @@
 		request_module(modname);
 		down(&phone_lock);
 		p = phone_device[minor];
-		if (p == NULL)
+		if (p == NULL || (new_fops = fops_get(p->f_op)) == NULL)
 		{
 			err=-ENODEV;
 			goto end;
 		}
 	}
 	old_fops = file->f_op;
-	file->f_op = fops_get(p->f_op);
+	file->f_op = new_fops;
 	if (p->open)
 		err = p->open(p, file);	/* Tell the device it is open */
 	if (err) {