Skip to content

Commit

Permalink
staging: nvec: Have nvec_write_async() return -ENOMEM on OOM
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Julian Andres Klode authored and Greg Kroah-Hartman committed Sep 30, 2011
1 parent ff169c1 commit 1b9bf62
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
11 changes: 9 additions & 2 deletions drivers/staging/nvec/nvec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);

Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/nvec/nvec.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 1b9bf62

Please sign in to comment.