diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-11-10 15:07:38 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-11-10 15:07:38 +0100 |
| commit | 7b1d8b4b3561c043a79d5933a7c1eb9266dc328d (patch) | |
| tree | 9c398aa20e22763a239d11eecf6fb4c1d06d4c97 /drivers/net | |
| parent | 0b0eada569b198aa3882cfec5874bc35a8a0fa14 (diff) | |
| parent | 4db0f1c3dbe6173fdf91cbeb83e250719332c6a3 (diff) | |
| download | barebox-7b1d8b4b3561c043a79d5933a7c1eb9266dc328d.tar.gz barebox-7b1d8b4b3561c043a79d5933a7c1eb9266dc328d.tar.xz | |
Merge branch 'for-next/mtd-nand'
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/e1000/eeprom.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c index 5b34e9b8d1..900be2f09b 100644 --- a/drivers/net/e1000/eeprom.c +++ b/drivers/net/e1000/eeprom.c @@ -1426,13 +1426,9 @@ static int e1000_mtd_erase(struct mtd_info *mtd, struct erase_info *instr) if (ret < 0) goto fail; - instr->state = MTD_ERASE_DONE; - mtd_erase_callback(instr); - return 0; fail: - instr->state = MTD_ERASE_FAILED; return ret; } |