Re: MODULE_ALIAS patch for ALSA

[Rusty Russell <rusty@rustcorp.com.au>]

In message <s5h7k2myc5t.wl@alsa2.suse.de> you write:
> Hi Rusty,

Hi Takashi!

> while i've played with it, i found that the alias "char-major-14-*"
> and "char-major-116-*" don't work.  "char-major-14" and
> "char-major-116" do work well.  is it a known issue?
> the module-init-tools is 0.9.14-pre2, BTW.

Yep, there's one odd one out.  Thanks.

Linus, please apply.
Rusty.
--
  Anyone who quotes me in their sig is an idiot. -- Rusty Russell.

Name: request_module char devices fix
Author: Rusty Russell
Status: Trivial

D: Module aliases are all of form "char-major-<major>-<minor>".  char_dev.c
D: calls request_module with "char-major-<major>".

diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .30462-linux-2.6.0-test9-bk4/fs/char_dev.c .30462-linux-2.6.0-test9-bk4.updated/fs/char_dev.c
--- .30462-linux-2.6.0-test9-bk4/fs/char_dev.c	2003-09-29 10:25:49.000000000 +1000
+++ .30462-linux-2.6.0-test9-bk4.updated/fs/char_dev.c	2003-10-31 13:20:49.000000000 +1100
@@ -434,7 +434,7 @@ void cdev_init(struct cdev *cdev, struct
 
 static struct kobject *base_probe(dev_t dev, int *part, void *data)
 {
-	request_module("char-major-%d", MAJOR(dev));
+	request_module("char-major-%d-%d", MAJOR(dev), MINOR(dev));
 	return NULL;
 }