Was Adam allowed to eat the fruit of the tree of knowledge?

The Bible attributes mankind’s fall from grace to an act of rebellion in the garden of Eden. This is described in Genesis 3, where Adam and Eve eat the fruit of the tree of the knowledge of good and evil, and are then cast out of paradise as a punishment. The preceding chapters of Genesis, however, are inconsistent concerning whether eating the fruit of this tree was forbidden.

In Genesis 2, God explicitly forbids Adam from eating the fruit of the tree of knowledge:

And the Lord God commanded the man, ‘You may freely eat of every tree in the garden; but of the tree of the knowledge of good and evil you shall not eat, for in the day that you eat of it you shall die.’ [Genesis 2:16-17 (NRSV)]

In Genesis 1, however, God equally explicitly says to the first humans that they can eat from any fruit-bearing tree on the planet:

God said, ‘See, I have given you every plant yielding seed that is upon the face of the earth, and every tree with seed in its fruit; you shall have them for food.’ [Genesis 1:29 (NRSV)]

So was the fruit of the tree of knowledge forbidden or not? If it was, then Genesis 1:29 contains an error. If it wasn’t, then Genesis 2:17 contains an error, and the Fall was the biggest miscarriage of justice of all time.