OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: nvec: Have nvec_write_async() return -ENOMEM on OOM 

Change nvec_write_async() to return an integer, 0 by default,
a negative error on failure. Change nvec_write_sync() to
check the return value and abort if it is negative.

Signed-off-by: Julian Andres Klode <jak@jak-linux.org>
Acked-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Julian Andres Klode 2011-09-27 19:00:55 +02:00 committed by Greg Kroah-Hartman
parent ff169c1487
commit 1b9bf629ea
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/nvec/nvec.c
View File

@ -154,13 +154,16 @@ static void nvec_gpio_set_value(struct nvec_chip *nvec, int value)
gpio_set_value(nvec->gpio, value);
}
void nvec_write_async(struct nvec_chip *nvec, const unsigned char *data,
int nvec_write_async(struct nvec_chip *nvec, const unsigned char *data,
short size)
{
struct nvec_msg *msg;
unsigned long flags;
msg = nvec_msg_alloc(nvec);
if (msg == NULL)
return -ENOMEM;
msg->data[0] = size;
memcpy(msg->data + 1, data, size);
msg->size = size + 1;
@ -170,6 +173,8 @@ void nvec_write_async(struct nvec_chip *nvec, const unsigned char *data,
spin_unlock_irqrestore(&nvec->tx_lock, flags);
queue_work(nvec->wq, &nvec->tx_work);
return 0;
}
EXPORT_SYMBOL(nvec_write_async);
@ -181,7 +186,9 @@ struct nvec_msg *nvec_write_sync(struct nvec_chip *nvec,
mutex_lock(&nvec->sync_write_mutex);
nvec->sync_write_pending = (data[1] << 8) + data[0];
nvec_write_async(nvec, data, size);
if (nvec_write_async(nvec, data, size) < 0)
return NULL;
dev_dbg(nvec->dev, "nvec_sync_write: 0x%04x\n",
nvec->sync_write_pending);

2
drivers/staging/nvec/nvec.h
View File

@ -97,7 +97,7 @@ struct nvec_chip {
int state;
};
extern void nvec_write_async(struct nvec_chip *nvec, const unsigned char *data,
extern int nvec_write_async(struct nvec_chip *nvec, const unsigned char *data,
short size);
extern struct nvec_msg *nvec_write_sync(struct nvec_chip *nvec,