Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 126718
b: refs/heads/master
c: 246c541
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Jan 6, 2009
1 parent dc0424d commit 068c73b
Show file tree
Hide file tree
Showing 2 changed files with 7 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: ff534766e4b9e25e6e4a1f133946dfa8cfe6a747
refs/heads/master: 246c541822cd6251aa38862f8f13412e5147a1ad
12 changes: 6 additions & 6 deletions trunk/drivers/staging/comedi/drivers/comedi_bond.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ MODULE_LICENSE("GPL");
# define STR(x) STR1(x)
#endif

int debug;
static int debug;
module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "If true, print extra cryptic debugging output useful"
"only to developers.");
Expand Down Expand Up @@ -408,7 +408,7 @@ static int doDevConfig(comedi_device *dev, comedi_devconfig *it)
int minor = it->options[i];
comedi_t *d;
int sdev = -1, nchans, tmp;
struct BondedDevice *bdev = 0;
struct BondedDevice *bdev = NULL;

if (minor < 0 || minor > COMEDI_NUM_BOARD_MINORS) {
ERROR("Minor %d is invalid!\n", minor);
Expand Down Expand Up @@ -515,18 +515,18 @@ static void doDevUnconfig(comedi_device *dev)
kfree(bdev);
}
kfree(devpriv->devs);
devpriv->devs = 0;
devpriv->devs = NULL;
kfree(devpriv);
dev->private = 0;
dev->private = NULL;
}
}

int __init init(void)
static int __init init(void)
{
return comedi_driver_register(&driver_bonding);
}

void __exit cleanup(void)
static void __exit cleanup(void)
{
comedi_driver_unregister(&driver_bonding);
}
Expand Down

0 comments on commit 068c73b

Please sign in to comment.