Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756104Ab0BBOAF (ORCPT ); Tue, 2 Feb 2010 09:00:05 -0500 Received: from mail-fx0-f215.google.com ([209.85.220.215]:56901 "EHLO mail-fx0-f215.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755974Ab0BBN77 (ORCPT ); Tue, 2 Feb 2010 08:59:59 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=mtH7oyXGWnV4xJ34uWm++AIOz727FlN0l9O+hQdlLAmjXCT6317/RrJKUvp4wnsbov 1nY/77S6do1boqG+y6NJebifseMydRy75LUkwEfD2YwaGP4FtbtsAZuOqSmYhGDrJOkg /vooSdJAEnyeEidcpsAMp34EaJusvePP7CS2A= From: Alessio Igor Bogani To: linux-usb@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Alessio Igor Bogani , Greg Kroah-Hartman , Johan Hovold , Alan Cox , Daniel Mack , Andrew Morton Subject: [PATCH] USB: ftdi_sio: Remove BKL Date: Tue, 2 Feb 2010 14:58:14 +0100 Message-Id: <1265119094-3356-1-git-send-email-abogani@texware.it> X-Mailer: git-send-email 1.6.3.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2165 Lines: 68 Seems to me that BKL don't protect nothing here anymore. So I would want suggest to remove it. Signed-off-by: Alessio Igor Bogani Cc: Greg Kroah-Hartman Cc: Johan Hovold Cc: Alan Cox Cc: Daniel Mack Cc: Andrew Morton --- drivers/usb/serial/ftdi_sio.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 216f187..592dc5f 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -1210,7 +1209,6 @@ static int set_serial_info(struct tty_struct *tty, if (copy_from_user(&new_serial, newinfo, sizeof(new_serial))) return -EFAULT; - lock_kernel(); old_priv = *priv; /* Do error checking and permission checking */ @@ -1218,7 +1216,6 @@ static int set_serial_info(struct tty_struct *tty, if (!capable(CAP_SYS_ADMIN)) { if (((new_serial.flags & ~ASYNC_USR_MASK) != (priv->flags & ~ASYNC_USR_MASK))) { - unlock_kernel(); return -EPERM; } priv->flags = ((priv->flags & ~ASYNC_USR_MASK) | @@ -1229,7 +1226,6 @@ static int set_serial_info(struct tty_struct *tty, if ((new_serial.baud_base != priv->baud_base) && (new_serial.baud_base < 9600)) { - unlock_kernel(); return -EINVAL; } @@ -1259,11 +1255,8 @@ check_and_exit: (priv->flags & ASYNC_SPD_MASK)) || (((priv->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST) && (old_priv.custom_divisor != priv->custom_divisor))) { - unlock_kernel(); change_speed(tty, port); } - else - unlock_kernel(); return 0; } /* set_serial_info */ -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/