[PATCH] 64bit resource: fix up printks for resources in sound drivers

[safe/jmp/linux-2.6] / sound / isa / es18xx.c

diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index 9fbc185..af60b0b 100644 (file)
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -85,6 +85,8 @@
 #include <linux/pnp.h>
 #include <linux/isapnp.h>
 #include <linux/moduleparam.h>
+#include <linux/delay.h>
+
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <sound/core.h>
@@ -2086,7 +2088,8 @@ static int __devinit snd_audiodrive_pnp(int dev, struct snd_audiodrive *acard,
                kfree(cfg);
                return -EAGAIN;
        }
-       snd_printdd("pnp: port=0x%lx\n", pnp_port_start(acard->devc, 0));
+       snd_printdd("pnp: port=0x%llx\n",
+                       (unsigned long long)pnp_port_start(acard->devc, 0));
        /* PnP initialization */
        pdev = acard->dev;
        pnp_init_resource_table(cfg);
@@ -2391,9 +2394,11 @@ static int __init alsa_card_es18xx_init(void)
                        continue;
                device = platform_device_register_simple(ES18XX_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
+               if (IS_ERR(device))
+                       continue;
+               if (!platform_get_drvdata(device)) {
+                       platform_device_unregister(device);
+                       continue;
                }
                platform_devices[i] = device;
                cards++;
@@ -2411,14 +2416,10 @@ static int __init alsa_card_es18xx_init(void)
 #ifdef MODULE
                snd_printk(KERN_ERR "ESS AudioDrive ES18xx soundcard not found or device busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_es18xx_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_es18xx_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_es18xx_exit(void)