From: Aivils S. <ai...@us...> - 2004-02-05 11:56:29
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/pci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22114/ruby-2.6/drivers/pci Modified Files: proc.c Log Message: sync to 2.6.1 Index: proc.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/pci/proc.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- proc.c 16 Sep 2003 06:54:42 -0000 1.1 +++ proc.c 5 Feb 2004 11:53:56 -0000 1.2 @@ -33,7 +33,7 @@ { loff_t new = -1; - lock_kernel(); + down(&file->f_dentry->d_inode->i_sem); switch (whence) { case 0: new = off; @@ -45,10 +45,12 @@ new = PCI_CFG_SPACE_SIZE + off; break; } - unlock_kernel(); - if (new < 0 || new > PCI_CFG_SPACE_SIZE) - return -EINVAL; - return (file->f_pos = new); + if (new < 0 || new > PCI_CFG_SPACE_SIZE) + new = -EINVAL; + else + file->f_pos = new; + up(&file->f_dentry->d_inode->i_sem); + return new; } static ssize_t |