Merge branch 'fix/hda' into for-linus

[safe/jmp/linux-2.6] / sound / oss / kahlua.c

diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c
index dfe670f..c180598 100644 (file)
--- a/sound/oss/kahlua.c
+++ b/sound/oss/kahlua.c
@@ -1,7 +1,7 @@
 /*
  *     Initialisation code for Cyrix/NatSemi VSA1 softaudio
  *
- *     (C) Copyright 2003 Red Hat Inc <alan@redhat.com>
+ *     (C) Copyright 2003 Red Hat Inc <alan@lxorguk.ukuu.org.uk>
  *
  * XpressAudio(tm) is used on the Cyrix MediaGX (now NatSemi Geode) systems.
  * The older version (VSA1) provides fairly good soundblaster emulation
@@ -67,7 +67,7 @@ static int __devinit probe_one(struct pci_dev *pdev, const struct pci_device_id
                return 1;
        
        mem = ioremap(base, 128);
-       if(mem == 0UL)
+       if (!mem)
                return 1;
        map = readw(mem + 0x18);        /* Read the SMI enables */
        iounmap(mem);