Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268575
b: refs/heads/master
c: 198dd26
h: refs/heads/master
i:
  268573: 1593104
  268571: 25874b1
  268567: eb7479c
  268559: a867079
  268543: 2a4319e
v: v3
  • Loading branch information
Julian Andres Klode authored and Greg Kroah-Hartman committed Sep 30, 2011
1 parent 7618b2d commit 9afbe6b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 391d2fa95c8e5e5ad3b06af235ce4aeae6514966
refs/heads/master: 198dd26714ba4a60ccc5ce70bc4506613b4f0c2d
6 changes: 4 additions & 2 deletions trunk/drivers/staging/nvec/nvec.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,13 @@ static struct nvec_msg *nvec_msg_alloc(struct nvec_chip *nvec)
*
* Free the given message
*/
static void nvec_msg_free(struct nvec_chip *nvec, struct nvec_msg *msg)
inline void nvec_msg_free(struct nvec_chip *nvec, struct nvec_msg *msg)
{
if (msg != &nvec->tx_scratch)
dev_vdbg(nvec->dev, "INFO: Free %ti\n", msg - nvec->msg_pool);
atomic_set(&msg->used, 0);
}
EXPORT_SYMBOL_GPL(nvec_msg_free);

/**
* nvec_msg_is_event - Return %true if @msg is an event
Expand Down Expand Up @@ -259,7 +260,8 @@ EXPORT_SYMBOL(nvec_write_async);
* interrupt handlers.
*
* Returns: A pointer to the response message on success,
* %NULL on failure.
* %NULL on failure. Free with nvec_msg_free() once no longer
* used.
*/
struct nvec_msg *nvec_write_sync(struct nvec_chip *nvec,
const unsigned char *data, short size)
Expand Down
3 changes: 3 additions & 0 deletions trunk/drivers/staging/nvec/nvec.h
Original file line number Diff line number Diff line change
Expand Up @@ -192,4 +192,7 @@ extern int nvec_register_notifier(struct nvec_chip *nvec,
extern int nvec_unregister_notifier(struct device *dev,
struct notifier_block *nb,
unsigned int events);

extern void nvec_msg_free(struct nvec_chip *nvec, struct nvec_msg *msg);

#endif

0 comments on commit 9afbe6b

Please sign in to comment.