diff --git a/[refs] b/[refs] index d47966d88f74..2843159d0e88 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1db1a8740abc90f4715a48cd970506686e6da5b1 +refs/heads/master: 5f6b5517bfcae217d52a7607b1bebc3a257f45d1 diff --git a/trunk/drivers/net/dm9000.c b/trunk/drivers/net/dm9000.c index f4ba0ffb8637..5fddc0ff8878 100644 --- a/trunk/drivers/net/dm9000.c +++ b/trunk/drivers/net/dm9000.c @@ -224,7 +224,7 @@ static void dm9000_outblk_32bit(void __iomem *reg, void *data, int count) static void dm9000_inblk_8bit(void __iomem *reg, void *data, int count) { - readsb(reg, data, count+1); + readsb(reg, data, count); } @@ -364,7 +364,7 @@ dm9000_release_board(struct platform_device *pdev, struct board_info *db) } if (db->addr_res != NULL) { - release_resource(db->data_req); + release_resource(db->addr_res); kfree(db->addr_req); } }