]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
Staging: comedi: Fix bug and coding style issue in usbdux.c
authorMorgan Gatti <morgan.gatti@gmail.com>
Tue, 11 May 2010 21:55:53 +0000 (23:55 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 11 May 2010 23:06:48 +0000 (16:06 -0700)
This is a patch to the usbdux.c file that resolve 2 errors in coding and
fix the warning about lengt of code lines

Signed-off-by: Morgan Gatti <morgan.gatti@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/comedi/drivers/usbdux.c

index 8942ae45708db6025a33a245bb45f580598cfa4d..df71515c7a30dc28e605eca7e9682a3b59d13747 100644 (file)
@@ -793,7 +793,7 @@ static int usbduxsub_stop(struct usbduxsub *usbduxsub)
 }
 
 static int usbduxsub_upload(struct usbduxsub *usbduxsub,
-                           uint8_t * local_transfer_buffer,
+                           uint8_t *local_transfer_buffer,
                            unsigned int startAddr, unsigned int len)
 {
        int errcode;
@@ -825,7 +825,7 @@ static int usbduxsub_upload(struct usbduxsub *usbduxsub,
 #define FIRMWARE_MAX_LEN 0x2000
 
 static int firmwareUpload(struct usbduxsub *usbduxsub,
-                         const u8 * firmwareBinary, int sizeFirmware)
+                         const u8 *firmwareBinary, int sizeFirmware)
 {
        int ret;
        uint8_t *fwBuf;
@@ -835,7 +835,7 @@ static int firmwareUpload(struct usbduxsub *usbduxsub,
 
        if (sizeFirmware > FIRMWARE_MAX_LEN) {
                dev_err(&usbduxsub->interface->dev,
-                       "comedi_: usbdux firmware binary it too large for FX2.\n");
+                       "usbdux firmware binary it too large for FX2.\n");
                return -ENOMEM;
        }
 
@@ -1264,8 +1264,8 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                            (this_usbduxsub->ai_interval) * 2;
                }
                this_usbduxsub->ai_timer = cmd->scan_begin_arg / (125000 *
-                                                                 (this_usbduxsub->
-                                                                  ai_interval));
+                                                         (this_usbduxsub->
+                                                          ai_interval));
        } else {
                /* interval always 1ms */
                this_usbduxsub->ai_interval = 1;