From: <ai...@ke...> - 2008-06-04 03:25:33
|
linux-core/drm_crtc.c | 1 - linux-core/drm_sysfs.c | 3 +++ linux-core/intel_display.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) New commits: commit 9f31bd09c1e748f72a30f6a0861cd72d93258992 Author: Dave Airlie <ai...@re...> Date: Wed Jun 4 13:16:49 2008 +1000 drm/sysfs: don't try an unregister if not registered diff --git a/linux-core/drm_sysfs.c b/linux-core/drm_sysfs.c index 01a3c04..c148256 100644 --- a/linux-core/drm_sysfs.c +++ b/linux-core/drm_sysfs.c @@ -301,6 +301,9 @@ void drm_sysfs_connector_remove(struct drm_connector *connector) { int i; + if (!device_is_registered(&connector->kdev)) + return; + DRM_DEBUG("removing \"%s\" from sysfs\n", drm_get_connector_name(connector)); for (i = 0; i < ARRAY_SIZE(connector_attrs); i++) device_remove_file(&connector->kdev, &connector_attrs[i]); commit 8e4c61e52651c47f3d9fbbe5e80455baff0de2bb Author: Dave Airlie <ai...@re...> Date: Wed Jun 4 13:09:20 2008 +1000 intel: use kzalloc diff --git a/linux-core/intel_display.c b/linux-core/intel_display.c index 3f5afac..6493af1 100644 --- a/linux-core/intel_display.c +++ b/linux-core/intel_display.c @@ -1491,7 +1491,7 @@ struct drm_framebuffer *intel_user_framebuffer_create(struct drm_device *dev, { struct intel_framebuffer *intel_fb; - intel_fb = kmalloc(sizeof(*intel_fb), GFP_KERNEL); + intel_fb = kzalloc(sizeof(*intel_fb), GFP_KERNEL); if (!intel_fb) return NULL; commit 8690ad8ae0778f2ccd8b428e1c6a8614ebc51707 Author: Dave Airlie <ai...@re...> Date: Wed Jun 4 13:09:05 2008 +1000 drm/modesetting: bo not used anymore diff --git a/linux-core/drm_crtc.c b/linux-core/drm_crtc.c index 73ad317..d2060fd 100644 --- a/linux-core/drm_crtc.c +++ b/linux-core/drm_crtc.c @@ -1257,7 +1257,6 @@ int drm_mode_cursor_ioctl(struct drm_device *dev, struct drm_mode_cursor *req = data; struct drm_mode_object *obj; struct drm_crtc *crtc; - struct drm_buffer_object *bo = NULL; /* must be set */ int ret = 0; DRM_DEBUG("\n"); |