Deadlock found when trying to get lock; try restarting transaction

Innodb row lock time             90.1 k
Innodb row lock time avg            154
Innodb row lock time max          4.8 k
Innodb row lock waits               584
Innodb deadlocks                      0

UPDATE datos_pedido SET entregado='1',unidades='2',almacen='2',fin_de_garantia='2020-5-14 17:34:42' WHERE pedido='355860' AND producto='46880'