[PATCH] Fix warning with b44.c on 64bit boxes
authorAlan Cox <alan@lxorguk.ukuu.org.uk>
Tue, 17 Jan 2006 17:53:56 +0000 (17:53 +0000)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 18 Jan 2006 00:28:50 +0000 (19:28 -0500)
sizeof() return is not an int, so use max_t to get the types right.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
drivers/net/b44.c

index 7aa49b974dc5510cb17a46099186ea43335ab22b..df9d6e80c4f29f88fb8f96a542cdbe89c5e08021 100644 (file)
@@ -2136,7 +2136,7 @@ static int __init b44_init(void)
 
        /* Setup paramaters for syncing RX/TX DMA descriptors */
        dma_desc_align_mask = ~(dma_desc_align_size - 1);
-       dma_desc_sync_size = max(dma_desc_align_size, sizeof(struct dma_desc));
+       dma_desc_sync_size = max_t(unsigned int, dma_desc_align_size, sizeof(struct dma_desc));
 
        return pci_module_init(&b44_driver);
 }