Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / drivers / isdn / hardware / eicon / divasmain.c

diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index 6d39f9360766a896ef33870d1bcb55f739fd7a2e..16a874bb15614bcd0a0bd58b27ecc3dd7edb7d15 100644 (file)
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -393,7 +393,7 @@ void diva_free_dma_map(void *hdev, struct _diva_dma_map_entry *pmap)
        dma_addr_t dma_handle;
        void *addr_handle;
 
-       for (i = 0; (pmap != 0); i++) {
+       for (i = 0; (pmap != NULL); i++) {
                diva_get_dma_map_entry(pmap, i, &cpu_addr, &phys_addr);
                if (!cpu_addr) {
                        break;
@@ -806,7 +806,6 @@ static int DIVA_INIT_FUNCTION divas_init(void)
 
        if (!create_divas_proc()) {
 #ifdef MODULE
-               remove_divas_proc();
                divas_unregister_chrdev();
                divasfunc_exit();
 #endif