Skip to contentSkip to conversation

lcd: Push the BKL down into the driver ioctl handler

PATCH Randolf Pohl 2 participants 2 messages May 23, 2008

lore
Share & tools
lore
#0 lore raw

unlock_kernel() before return:

Quoted 6 lines
drivers/char/lcd.c +0 -0
index 4fe9206..1690cfb 100644

[...]

Quoted 8 lines
drivers/char/lcd.c +1 -1
@@ -399,17 +408,15 @@ static int lcd_ioctl(struct inode *inode, struct file *file,
 			if (__copy_to_user
 			    ((struct lcd_display *) arg, &button_display,
 			     sizeof(struct lcd_display)))
-			      return -EFAULT;
+			      ret = -EFAULT;
 			break;
 		}

drivers/char/lcd.c static int lcd_ioctl(struct inode *inode, struct file *file, · line 418

Quoted 10 lines
drivers/char/lcd.c +2 -5
 
 	default:
-	      return -EINVAL;
-
+	      ret = -ENOTTY;
 	}
-
-       return 0;
-
+       lock_kernel();

Shouldn't this be unlock_kernel();

drivers/char/lcd.c static ssize_t lcd_read(struct file *file, char *buf, · line 474

Quoted 12 lines
drivers/char/lcd.c +2 -1
+       return ret;
 }
 
 static int lcd_open(struct inode *inode, struct file *file)
@@ -462,7 +469,7 @@ static ssize_t lcd_read(struct file *file, char *buf,
 
 static const struct file_operations lcd_fops = {
 	.read = lcd_read,
-       .ioctl = lcd_ioctl,
+       .unlocked_ioctl = lcd_ioctl,
 	.open = lcd_open,
 };

Cheers,

R.

Signature · 2 lines
GMX startet ShortView.de. Hier findest Du Leute mit Deinen Interessen!
Jetzt dabei sein: http://www.shortview.de/?mc=sv_ext_mf@gmx