Lil Wayne has been sentenced to three years' probation on a drug possession charge.
The rapper, real name Dwayne Carter, is currently serving a one-year jail sentence in Arizona on an unrelated gun charge and will begin his probation when he is released from prison.
The 'Lollipop' rapper was arrested in 2008 when police at a US Border Patrol checkpoint found an ounce of cocaine, 41 grams of ecstasy, four ounces of marijuana and a 40-calibre pistol on board the star's tour bus.
He avoided facing charges of possession of a narcotic drug for sale, misconduct involving weapons and possession of drug paraphernalia by pleading guilty to one count of possession of a dangerous drug on June 18.
James Tilson, the rapper's lawyer in Arizona, said: "We're quite glad that we were able to wrap everything up. It's a favourable plea agreement that will allow Mr Carter to pursue his career."
Wayne began his current jail term at New York's Rikers Island prison in March, causing fellow hip-hop stars to lament the loss of the rapper from the music industry.
Diddy said: "I think we gonna miss a certain energy that Wayne has. The beauty about it is, he'll be back, and hopefully he'll come back a better person."