diff --git a/[refs] b/[refs] index c042f328b452..5d9402024d07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54299ef7e9ae4b5d47b02f3abea168cdc62a6f70 +refs/heads/master: 3f6602ad56dc538a846367bd6a05ac7ac4d3e641 diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c index 858b191517b3..504a48ff73c8 100644 --- a/trunk/drivers/net/r6040.c +++ b/trunk/drivers/net/r6040.c @@ -273,7 +273,7 @@ static void r6040_init_ring_desc(struct r6040_descriptor *desc_ring, dma_addr_t mapping = desc_dma; while (size-- > 0) { - mapping += sizeof(sizeof(*desc)); + mapping += sizeof(*desc); desc->ndesc = cpu_to_le32(mapping); desc->vndescp = desc + 1; desc++;