projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB (3193): Replace del_timer with del_timer_sync
[powerpc.git]
/
drivers
/
acpi
/
video.c
diff --git
a/drivers/acpi/video.c
b/drivers/acpi/video.c
index
b9132b5
..
d10668f
100644
(file)
--- a/
drivers/acpi/video.c
+++ b/
drivers/acpi/video.c
@@
-297,11
+297,12
@@
acpi_video_device_set_state(struct acpi_video_device *device, int state)
int status;
union acpi_object arg0 = { ACPI_TYPE_INTEGER };
struct acpi_object_list args = { 1, &arg0 };
int status;
union acpi_object arg0 = { ACPI_TYPE_INTEGER };
struct acpi_object_list args = { 1, &arg0 };
+ unsigned long ret;
ACPI_FUNCTION_TRACE("acpi_video_device_set_state");
arg0.integer.value = state;
ACPI_FUNCTION_TRACE("acpi_video_device_set_state");
arg0.integer.value = state;
- status = acpi_evaluate_integer(device->handle, "_DSS", &args,
NULL
);
+ status = acpi_evaluate_integer(device->handle, "_DSS", &args,
&ret
);
return_VALUE(status);
}
return_VALUE(status);
}
@@
-333,8
+334,7
@@
acpi_video_device_lcd_query_levels(struct acpi_video_device *device,
return_VALUE(0);
err:
return_VALUE(0);
err:
- if (buffer.pointer)
- kfree(buffer.pointer);
+ kfree(buffer.pointer);
return_VALUE(status);
}
return_VALUE(status);
}
@@
-812,7
+812,7
@@
acpi_video_device_write_brightness(struct file *file,
ACPI_FUNCTION_TRACE("acpi_video_device_write_brightness");
ACPI_FUNCTION_TRACE("acpi_video_device_write_brightness");
- if (!dev || count + 1 > sizeof str)
+ if (!dev ||
!dev->brightness ||
count + 1 > sizeof str)
return_VALUE(-EINVAL);
if (copy_from_user(str, buffer, count))
return_VALUE(-EINVAL);
if (copy_from_user(str, buffer, count))
@@
-1487,8
+1487,7
@@
static int acpi_video_device_enumerate(struct acpi_video_bus *video)
}
active_device_list[count].value.int_val = ACPI_VIDEO_HEAD_END;
}
active_device_list[count].value.int_val = ACPI_VIDEO_HEAD_END;
- if (video->attached_array)
- kfree(video->attached_array);
+ kfree(video->attached_array);
video->attached_array = active_device_list;
video->attached_count = count;
video->attached_array = active_device_list;
video->attached_count = count;
@@
-1644,8
+1643,7
@@
static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
printk(KERN_WARNING PREFIX
"hhuuhhuu bug in acpi video driver.\n");
printk(KERN_WARNING PREFIX
"hhuuhhuu bug in acpi video driver.\n");
- if (data->brightness)
- kfree(data->brightness);
+ kfree(data->brightness);
kfree(data);
}
kfree(data);
}
@@
-1830,8
+1828,7
@@
static int acpi_video_bus_remove(struct acpi_device *device, int type)
acpi_video_bus_put_devices(video);
acpi_video_bus_remove_fs(device);
acpi_video_bus_put_devices(video);
acpi_video_bus_remove_fs(device);
- if (video->attached_array)
- kfree(video->attached_array);
+ kfree(video->attached_array);
kfree(video);
return_VALUE(0);
kfree(video);
return_VALUE(0);