From 081ecc071a893919bab75d06f1099251b5a25824 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 17 Jan 2006 17:53:56 +0000 Subject: [PATCH] --- yaml --- r: 18839 b: refs/heads/master c: 22d4d77183f0af8b3b643544a5ae64ec6105d88b h: refs/heads/master i: 18837: ed86881980ebf911295bd0279161af766fb0e6db 18835: 41c634142da8d268fb69e7c410cc177bd68041f4 18831: 48ff07643959b478069bb780f503c017184db9f3 v: v3 --- [refs] | 2 +- trunk/drivers/net/b44.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c88bbc33b0b7..1789aa772f82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0570cc08194630bd78aef7c2c2b4f6a3f02c2bba +refs/heads/master: 22d4d77183f0af8b3b643544a5ae64ec6105d88b diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c index 7aa49b974dc5..df9d6e80c4f2 100644 --- a/trunk/drivers/net/b44.c +++ b/trunk/drivers/net/b44.c @@ -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); }