diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-10-18 18:28:24 +0200 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-10-18 18:28:24 +0200 |
| commit | ed8c3174dd227031d1f3b9fa4fbb512f8f623434 (patch) | |
| tree | bac4953f8899d6600f4716c0bcde1e25e34c2591 /drivers/gpu/drm/drm_sysfs.c | |
| parent | bq27x00_battery: use unaligned access helper (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| download | linux-ed8c3174dd227031d1f3b9fa4fbb512f8f623434.tar.xz linux-ed8c3174dd227031d1f3b9fa4fbb512f8f623434.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/power/Makefile
Diffstat (limited to 'drivers/gpu/drm/drm_sysfs.c')
| -rw-r--r-- | drivers/gpu/drm/drm_sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index af211a0ef179..1611b9bcbe7f 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c @@ -184,7 +184,7 @@ int drm_sysfs_device_add(struct drm_minor *minor) err_out_files: if (i > 0) for (j = 0; j < i; j++) - device_remove_file(&minor->kdev, &device_attrs[i]); + device_remove_file(&minor->kdev, &device_attrs[j]); device_unregister(&minor->kdev); err_out: |