Import 2.3.46pre1

diff --git a/Makefile b/Makefile
index 980b840f140cc19f1b2f08abc96c6d4548ebda6b..23509086c0399d0cab71e7eaff0e4855b94b6e35 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 3
-SUBLEVEL = 45
+SUBLEVEL = 46
 EXTRAVERSION =
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)

diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index e7c945c0c74aeba7a6843956d50105ee712dca20..704f7c95c7266364da153b415dea8d1843b81c71 100644 (file)
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -1156,6 +1156,8 @@ struct pci_bus *pcmcia_lookup_bus(client_handle_t handle)
        return s->cap.cb_dev->subordinate;
 }
 
+EXPORT_SYMBOL(pcmcia_lookup_bus);
+
 #endif
 
 /*======================================================================
@@ -2188,7 +2190,7 @@ int CardServices(int func, void *a1, void *a2, void *a3)
     {
        memory_handle_t m;
         int ret = pcmcia_open_memory(a1, a2, &m);
-        (memory_handle_t *)a1 = m;
+        *(memory_handle_t *)a1 = m;
        return  ret;
     }
         break;
@@ -2202,7 +2204,7 @@ int CardServices(int func, void *a1, void *a2, void *a3)
     {
        eraseq_handle_t w;
         int ret = pcmcia_register_erase_queue(a1, a2, &w);
-        (eraseq_handle_t *)a1 = w;
+        *(eraseq_handle_t *)a1 = w;
        return  ret;
     }
         break;
@@ -2227,7 +2229,7 @@ int CardServices(int func, void *a1, void *a2, void *a3)
     {
        window_handle_t w;
         int ret = pcmcia_request_window(a1, a2, &w);
-        (window_handle_t *)a1 = w;
+        *(window_handle_t *)a1 = w;
        return  ret;
     }
         break;
@@ -2297,7 +2299,6 @@ EXPORT_SYMBOL(pcmcia_get_next_window);
 EXPORT_SYMBOL(pcmcia_get_status);
 EXPORT_SYMBOL(pcmcia_get_tuple_data);
 EXPORT_SYMBOL(pcmcia_insert_card);
-EXPORT_SYMBOL(pcmcia_lookup_bus);
 EXPORT_SYMBOL(pcmcia_map_mem_page);
 EXPORT_SYMBOL(pcmcia_modify_configuration);
 EXPORT_SYMBOL(pcmcia_modify_window);

diff --git a/drivers/sound/ac97_codec.c b/drivers/sound/ac97_codec.c
index eb0b3d27bac8f40620499899551dc34ae4f796be..56ee3df89072fa12e39f0e0e062f721147278bb6 100644 (file)
--- a/drivers/sound/ac97_codec.c
+++ b/drivers/sound/ac97_codec.c
@@ -38,6 +38,8 @@ static void ac97_set_mixer(struct ac97_codec *codec, unsigned int oss_mixer, uns
 static int ac97_recmask_io(struct ac97_codec *codec, int rw, int mask);
 static int ac97_mixer_ioctl(struct ac97_codec *codec, unsigned int cmd, unsigned long arg);
 
+#define arraysize(x)   (sizeof(x)/sizeof((x)[0]))
+
 static struct {
        unsigned int id;
        char *name;
@@ -380,7 +382,7 @@ static int ac97_mixer_ioctl(struct ac97_codec *codec, unsigned int cmd, unsigned
                                return -EINVAL;
 
                        /* do we ever want to touch the hardware? */
-                       val = codec->read_mixer(card, i);
+                       val = codec->read_mixer(codec, i);
                        /* val = codec->mixer_state[i]; */
                        break;
                }
@@ -494,9 +496,11 @@ int ac97_probe_codec(struct ac97_codec *codec)
        if ((cap = codec->codec_read(codec, AC97_RESET)) & 0x8000)
                return 0;
        
+       codec->name = NULL;
+       codec->codec_init = NULL;
        id1 = codec->codec_read(codec, AC97_VENDOR_ID1);
        id2 = codec->codec_read(codec, AC97_VENDOR_ID2);
-       for (i = 0, codec->name = NULL; i < arraysize (ac97_codec_ids[i]); i++) {
+       for (i = 0; i < arraysize(ac97_codec_ids); i++) {
                if (ac97_codec_ids[i].id == ((id1 << 16) | id2)) {
                        codec->name = ac97_codec_ids[i].name;
                        codec->codec_init = ac97_codec_ids[i].init;