Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efe69414 authored by Cyril Bur's avatar Cyril Bur Committed by Michael Ellerman
Browse files

mtd: powernv_flash: Don't return -ERESTARTSYS on interrupted token acquisition 



Because the MTD core might split up a read() or write() from userspace
into several calls to the driver, we may fail to get a token but already
have done some work, best to return -EINTR back to userspace and have
them decide what to do.

Signed-off-by: default avatarCyril Bur <cyrilbur@gmail.com>
Acked-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent e32ec15a

drivers/mtd/devices/powernv_flash.c

+7 −0
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ enum flash_op { 
	FLASH_OP_ERASE,

};



/*

 * Don't return -ERESTARTSYS if we can't get a token, the MTD core

 * might have split up the call from userspace and called into the

 * driver more than once, we'll already have done some amount of work.

 */

static int powernv_flash_async_op(struct mtd_info *mtd, enum flash_op op,

		loff_t offset, size_t len, size_t *retlen, u_char *buf)

{
@@ -63,6 +68,8 @@ static int powernv_flash_async_op(struct mtd_info *mtd, enum flash_op op, 
	if (token < 0) {

		if (token != -ERESTARTSYS)

			dev_err(dev, "Failed to get an async token\n");

		else

			token = -EINTR;

		return token;

	}