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

[mv-sheeva.git] / drivers / staging / frontier / alphatrack.c

diff --git a/drivers/staging/frontier/alphatrack.c b/drivers/staging/frontier/alphatrack.c
index ef7fbf8b069a58dea52e0374be2afcb575c79983..2babb034a25417286c008da4512099818c77ab36 100644 (file)
--- a/drivers/staging/frontier/alphatrack.c
+++ b/drivers/staging/frontier/alphatrack.c
@@ -89,7 +89,7 @@ static int debug = ALPHATRACK_DEBUG;
 
 /* Use our own dbg macro */
 #define dbg_info(dev, format, arg...) do \
-    { if (debug) dev_info(dev , format , ## arg); } while (0)
+       { if (debug) dev_info(dev , format , ## arg); } while (0)
 
 #define alphatrack_ocmd_info(dev, cmd, format, arg...)
 
@@ -769,7 +769,7 @@ static int usb_alphatrack_probe(struct usb_interface *intf,
        }
 
        dev->write_buffer =
-           kmalloc(sizeof(struct alphatrack_ocmd) * true_size, GFP_KERNEL);
+           kmalloc(true_size * sizeof(struct alphatrack_ocmd), GFP_KERNEL);
 
        if (!dev->write_buffer) {
                dev_err(&intf->dev, "Couldn't allocate write_buffer\n");