Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / comedi / drivers / comedi_bond.c

diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c
index cfcbd9b8f39376bc9de300a86104c198db2a4d2c..d8aefb23d6b9512257c0ac1e61e4760fef7e40dd 100644 (file)
--- a/drivers/staging/comedi/drivers/comedi_bond.c
+++ b/drivers/staging/comedi/drivers/comedi_bond.c
@@ -370,7 +370,7 @@ static int doDevConfig(struct comedi_device *dev, struct comedi_devconfig *it)
        struct comedi_device *devs_opened[COMEDI_NUM_BOARD_MINORS];
 
        memset(devs_opened, 0, sizeof(devs_opened));
-       devpriv->name[0] = 0;;
+       devpriv->name[0] = 0;
        /* Loop through all comedi devices specified on the command-line,
           building our device list */
        for (i = 0; i < COMEDI_NDEVCONFOPTS && (!i || it->options[i]); ++i) {