lkml.org 
[lkml]   [2001]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] fix for drivers/char/pc_keyb.c in 2.5.1-pre3
Hi,

Here's a patch for 2.5.1-pre3 to fix the compile time problems in
drivers/char/pc_keyb.c. It also fixes the places where the flags
variable is the wrong type.

thanks,

greg k-h


diff -Nru a/drivers/char/pc_keyb.c b/drivers/char/pc_keyb.c
--- a/drivers/char/pc_keyb.c Wed Nov 28 16:34:37 2001
+++ b/drivers/char/pc_keyb.c Wed Nov 28 16:34:37 2001
@@ -420,7 +420,7 @@
kbd_write_command(KBD_CCMD_WRITE_MODE);
kb_wait();
kbd_write_output(AUX_INTS_OFF);
- spin_unlock(&kbd_controller_lock, flags);
+ spin_unlock(&kbd_controller_lock);
}
spin_unlock_irqrestore( &aux_count_lock,flags );
}
@@ -433,7 +433,7 @@
static inline void handle_mouse_event(unsigned char scancode)
{
#ifdef CONFIG_PSMOUSE
- int flags;
+ unsigned long flags;
static unsigned char prev_code;
if (mouse_reply_expected) {
if (scancode == AUX_ACK) {
@@ -1052,9 +1052,9 @@

static int release_aux(struct inode * inode, struct file * file)
{
- int flags;
+ unsigned long flags;
fasync_aux(-1, file, 0);
- spin_lock_irqsave( &aux_count, flags );
+ spin_lock_irqsave( &aux_count_lock, flags );
if ( --aux_count ) {
spin_unlock_irqrestore( &aux_count_lock );
return 0;
@@ -1073,7 +1073,7 @@

static int open_aux(struct inode * inode, struct file * file)
{
- int flags;
+ unsigned long flags;
spin_lock_irqsave( &aux_count_lock, flags );
if ( aux_count++ ) {
spin_unlock_irqrestore( &aux_count_lock );
-
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/
\
 
 \ /
  Last update: 2005-03-22 13:18    [W:0.055 / U:2.668 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site