Norwich defender Leon Barnett has returned to Carrow Road from his loan spell with newly promoted Cardiff.