diff --git a/[refs] b/[refs] index ebf6bd6d82ad..28b3d640e2fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7334571f724df7a19f48cc974e991e00afde1e2f +refs/heads/master: d1dd0c23916bd781de27bc5ec1c295064e9ce9cc diff --git a/trunk/drivers/acpi/video.c b/trunk/drivers/acpi/video.c index b3b352b8330a..2cf264fd52e0 100644 --- a/trunk/drivers/acpi/video.c +++ b/trunk/drivers/acpi/video.c @@ -564,12 +564,13 @@ acpi_video_device_find_cap (struct acpi_video_device *device) int count = 0; union acpi_object *o; - br = kmalloc(sizeof &br, GFP_KERNEL); + br = kmalloc(sizeof(*br), GFP_KERNEL); if (!br) { printk(KERN_ERR "can't allocate memory\n"); } else { - memset(br, 0, sizeof &br); - br->levels = kmalloc(obj->package.count * sizeof &br->levels, GFP_KERNEL); + memset(br, 0, sizeof(*br)); + br->levels = kmalloc(obj->package.count * + sizeof *(br->levels), GFP_KERNEL); if (!br->levels) goto out; @@ -584,8 +585,7 @@ acpi_video_device_find_cap (struct acpi_video_device *device) } out: if (count < 2) { - if (br->levels) - kfree(br->levels); + kfree(br->levels); kfree(br); } else { br->count = count; @@ -595,8 +595,7 @@ acpi_video_device_find_cap (struct acpi_video_device *device) } } - if (obj) - kfree(obj); + kfree(obj); return_VOID; }