Chris Brown has pleaded guilty to misdemeanour assault in Washington DC, where he was accused of punching a man who tried to join a picture the singer was taking with two women outside a hotel.
Brown was sentenced to time served. He had been in jail for two days in the case.
He had been arrested and charged with misdemeanour assault in October after the scuffle outside the W hotel.
The victim in the case says Brown hit him after he tried to get in a photograph Brown was taking with two women.
Brown had previously acknowledged to a judge in Los Angeles that he had violated probation by committing a crime in Washington.
He had been on probation for a 2009 attack on the singer Rihanna, his then-girlfriend.