]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] cx231xx: Paranoic stack memory save
authorPeter Senna Tschudin <peter.senna@gmail.com>
Thu, 14 Jun 2012 16:58:09 +0000 (13:58 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Jun 2012 20:05:13 +0000 (17:05 -0300)
Saves 255 bytes of stack memory on cx231xx_usb_probe() by removing a char array.

Tested by compilation only.

Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/cx231xx/cx231xx-cards.c

index 8ed460d692e0485925c156d0314e9ee50756c634..02d4d36735d39e6d68a1f8b82d3f3896f4a8e468 100644 (file)
@@ -1023,7 +1023,6 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
        int nr = 0, ifnum;
        int i, isoc_pipe = 0;
        char *speed;
-       char descr[255] = "";
        struct usb_interface_assoc_descriptor *assoc_desc;
 
        udev = usb_get_dev(interface_to_usbdev(interface));
@@ -1098,20 +1097,10 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
                speed = "unknown";
        }
 
-       if (udev->manufacturer)
-               strlcpy(descr, udev->manufacturer, sizeof(descr));
-
-       if (udev->product) {
-               if (*descr)
-                       strlcat(descr, " ", sizeof(descr));
-               strlcat(descr, udev->product, sizeof(descr));
-       }
-       if (*descr)
-               strlcat(descr, " ", sizeof(descr));
-
-       cx231xx_info("New device %s@ %s Mbps "
+       cx231xx_info("New device %s %s @ %s Mbps "
             "(%04x:%04x) with %d interfaces\n",
-            descr,
+            udev->manufacturer ? udev->manufacturer : "",
+            udev->product ? udev->product : "",
             speed,
             le16_to_cpu(udev->descriptor.idVendor),
             le16_to_cpu(udev->descriptor.idProduct),