diff options
Diffstat (limited to 'drivers/char/synclinkmp.c')
-rw-r--r-- | drivers/char/synclinkmp.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c index e98c3e6f821..b716a73a236 100644 --- a/drivers/char/synclinkmp.c +++ b/drivers/char/synclinkmp.c | |||
@@ -1303,7 +1303,7 @@ static void tx_release(struct tty_struct *tty) | |||
1303 | * | 1303 | * |
1304 | * Return Value: 0 if success, otherwise error code | 1304 | * Return Value: 0 if success, otherwise error code |
1305 | */ | 1305 | */ |
1306 | static int ioctl(struct tty_struct *tty, struct file *file, | 1306 | static int do_ioctl(struct tty_struct *tty, struct file *file, |
1307 | unsigned int cmd, unsigned long arg) | 1307 | unsigned int cmd, unsigned long arg) |
1308 | { | 1308 | { |
1309 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; | 1309 | SLMP_INFO *info = (SLMP_INFO *)tty->driver_data; |
@@ -1393,6 +1393,16 @@ static int ioctl(struct tty_struct *tty, struct file *file, | |||
1393 | return 0; | 1393 | return 0; |
1394 | } | 1394 | } |
1395 | 1395 | ||
1396 | static int ioctl(struct tty_struct *tty, struct file *file, | ||
1397 | unsigned int cmd, unsigned long arg) | ||
1398 | { | ||
1399 | int ret; | ||
1400 | lock_kernel(); | ||
1401 | ret = do_ioctl(tty, file, cmd, arg); | ||
1402 | unlock_kernel(); | ||
1403 | return ret; | ||
1404 | } | ||
1405 | |||
1396 | /* | 1406 | /* |
1397 | * /proc fs routines.... | 1407 | * /proc fs routines.... |
1398 | */ | 1408 | */ |