Skip to contentSkip to conversation

PATCH: Fix warning with b44.c on 64bit boxes

PATCH Alan Cox 1 participant 1 message Jan 17, 2006 Network drivers

lore
Share & tools
lore

Alan Cox

author
#0 lore raw

sizeof() return is not an int, so use max_t to get the types right.

drivers/net/b44.c +1 -1
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.16-rc1/drivers/net/b44.c linux-2.6.16-rc1/drivers/net/b44.c
@@ -2136,7 +2136,7 @@
 
 	/* 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);
 }