diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-08-30 23:45:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-08-30 23:45:59 -0700 |
| commit | c334ec3406bd4e366a4138570332d4e19fa70128 (patch) | |
| tree | d465dd090c583e8646a98bf570a287c643ba66cb /sound/core/control.c | |
| parent | ed8dff304648833f2acf9b3189a1e611355111b0 (diff) | |
| parent | 9b9f98eec3f1f66d0186f7c95e3d724cf3b6765b (diff) | |
Merge http://lia64.bkbits.net/to-linus-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'sound/core/control.c')
| -rw-r--r-- | sound/core/control.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index 75ccb087609f..fe654fd91508 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -42,7 +42,7 @@ static LIST_HEAD(snd_control_ioctls); static int snd_ctl_open(struct inode *inode, struct file *file) { - int cardnum = SNDRV_MINOR_CARD(minor(inode->i_rdev)); + int cardnum = SNDRV_MINOR_CARD(iminor(inode)); unsigned long flags; snd_card_t *card; snd_ctl_file_t *ctl; |