VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / usb / host / ehci-mem.c

diff --git a/drivers/usb/host/ehci-mem.c b/drivers/usb/host/ehci-mem.c
index 5f93816..31f311d 100644 (file)
--- a/drivers/usb/host/ehci-mem.c
+++ b/drivers/usb/host/ehci-mem.c
@@ -47,7 +47,7 @@ static struct usb_hcd *ehci_hcd_alloc (void)
                ehci->hcd.product_desc = "EHCI Host Controller";
                return &ehci->hcd;
        }
-       return 0;
+       return NULL;
 }
 
 static void ehci_hcd_free (struct usb_hcd *hcd)
@@ -125,7 +125,7 @@ static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci, int flags)
        if (qh->dummy == 0) {
                ehci_dbg (ehci, "no dummy td\n");
                dma_pool_free (ehci->qh_pool, qh, qh->qh_dma);
-               qh = 0;
+               qh = NULL;
        }
        return qh;
 }
@@ -153,36 +153,36 @@ static void ehci_mem_cleanup (struct ehci_hcd *ehci)
 {
        if (ehci->async)
                qh_put (ehci->async);
-       ehci->async = 0;
+       ehci->async = NULL;
 
        /* DMA consistent memory and pools */
        if (ehci->qtd_pool)
                dma_pool_destroy (ehci->qtd_pool);
-       ehci->qtd_pool = 0;
+       ehci->qtd_pool = NULL;
 
        if (ehci->qh_pool) {
                dma_pool_destroy (ehci->qh_pool);
-               ehci->qh_pool = 0;
+               ehci->qh_pool = NULL;
        }
 
        if (ehci->itd_pool)
                dma_pool_destroy (ehci->itd_pool);
-       ehci->itd_pool = 0;
+       ehci->itd_pool = NULL;
 
        if (ehci->sitd_pool)
                dma_pool_destroy (ehci->sitd_pool);
-       ehci->sitd_pool = 0;
+       ehci->sitd_pool = NULL;
 
        if (ehci->periodic)
                dma_free_coherent (ehci->hcd.self.controller,
                        ehci->periodic_size * sizeof (u32),
                        ehci->periodic, ehci->periodic_dma);
-       ehci->periodic = 0;
+       ehci->periodic = NULL;
 
        /* shadow periodic table */
        if (ehci->pshadow)
                kfree (ehci->pshadow);
-       ehci->pshadow = 0;
+       ehci->pshadow = NULL;
 }
 
 /* remember to add cleanup code (above) if you add anything here */