Update of /cvsroot/alsa/alsa-kernel/core/oss
In directory sc8-pr-cvs1:/tmp/cvs-serv28241/alsa-kernel/core/oss
Modified Files:
mixer_oss.c pcm_oss.c
Log Message:
- sync with the 2.6 tree (imajor, iminor)
- fixed firmware ioctls for sscape and hdsp drivers (ioctl out of range)
Index: mixer_oss.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/mixer_oss.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mixer_oss.c 31 May 2003 11:21:09 -0000 1.23
+++ mixer_oss.c 25 Sep 2003 18:55:43 -0000 1.24
@@ -36,7 +36,7 @@
static int snd_mixer_oss_open(struct inode *inode, struct file *file)
{
- int cardnum = SNDRV_MINOR_OSS_CARD(minor(inode->i_rdev));
+ int cardnum = SNDRV_MINOR_OSS_CARD(iminor(inode));
snd_card_t *card;
snd_mixer_oss_file_t *fmixer;
int err;
Index: pcm_oss.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/pcm_oss.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- pcm_oss.c 10 Sep 2003 13:51:30 -0000 1.49
+++ pcm_oss.c 25 Sep 2003 18:55:43 -0000 1.50
@@ -1711,7 +1711,7 @@
static int snd_pcm_oss_open(struct inode *inode, struct file *file)
{
- int minor = minor(inode->i_rdev);
+ int minor = iminor(inode);
int cardnum = SNDRV_MINOR_OSS_CARD(minor);
int device;
int err;
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
