Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197343
b: refs/heads/master
c: 67b0e64
h: refs/heads/master
i:
  197341: 3e4b581
  197339: 4890b2a
  197335: bebc4e0
  197327: 5f1eca4
  197311: fa75d59
v: v3
  • Loading branch information
Mark Rankilor authored and Greg Kroah-Hartman committed May 11, 2010
1 parent 5867f12 commit 5939e82
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 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: 97b9e5ae4039ab32ea5fcef999f6e54ca4af5c94
refs/heads/master: 67b0e64a7b219550cc3378800f680e2bb86a10f9
16 changes: 10 additions & 6 deletions trunk/drivers/staging/comedi/drivers.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ static void __comedi_device_detach(struct comedi_device *dev)
if (dev->driver)
dev->driver->detach(dev);
else
printk(KERN_WARNING "BUG: dev->driver=NULL in comedi_device_detach()\n");
printk(KERN_WARNING
"BUG: dev->driver=NULL in comedi_device_detach()\n");
cleanup_device(dev);
}

Expand Down Expand Up @@ -148,7 +149,8 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* report valid board names before returning error */
for (driv = comedi_drivers; driv; driv = driv->next) {
if (!try_module_get(driv->module)) {
printk(KERN_INFO "comedi: failed to increment module count\n");
printk(KERN_INFO
"comedi: failed to increment module count\n");
continue;
}
comedi_report_boards(driv);
Expand Down Expand Up @@ -250,7 +252,8 @@ static int postconfig(struct comedi_device *dev)
async =
kzalloc(sizeof(struct comedi_async), GFP_KERNEL);
if (async == NULL) {
printk(KERN_INFO "failed to allocate async struct\n");
printk(KERN_INFO
"failed to allocate async struct\n");
return -ENOMEM;
}
init_waitqueue_head(&async->wait_head);
Expand Down Expand Up @@ -560,7 +563,8 @@ static unsigned int comedi_buf_munge(struct comedi_async *async,

block_size = num_bytes - count;
if (block_size < 0) {
printk(KERN_WARNING "%s: %s: bug! block_size is negative\n",
printk(KERN_WARNING
"%s: %s: bug! block_size is negative\n",
__FILE__, __func__);
break;
}
Expand Down Expand Up @@ -679,8 +683,8 @@ unsigned comedi_buf_read_free(struct comedi_async *async, unsigned int nbytes)
smp_mb();
if ((int)(async->buf_read_count + nbytes -
async->buf_read_alloc_count) > 0) {
printk
("comedi: attempted to read-free more bytes than have been read-allocated.\n");
printk(KERN_INFO
"comedi: attempted to read-free more bytes than have been read-allocated.\n");
nbytes = async->buf_read_alloc_count - async->buf_read_count;
}
async->buf_read_count += nbytes;
Expand Down

0 comments on commit 5939e82

Please sign in to comment.