diff options
Diffstat (limited to 'drivers/misc/sony-laptop.c')
-rw-r--r-- | drivers/misc/sony-laptop.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index 5a97d3a9d745..06f07e19dc70 100644 --- a/drivers/misc/sony-laptop.c +++ b/drivers/misc/sony-laptop.c | |||
@@ -1920,7 +1920,6 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on) | |||
1920 | 1920 | ||
1921 | static int sonypi_misc_release(struct inode *inode, struct file *file) | 1921 | static int sonypi_misc_release(struct inode *inode, struct file *file) |
1922 | { | 1922 | { |
1923 | sonypi_misc_fasync(-1, file, 0); | ||
1924 | atomic_dec(&sonypi_compat.open_count); | 1923 | atomic_dec(&sonypi_compat.open_count); |
1925 | return 0; | 1924 | return 0; |
1926 | } | 1925 | } |
@@ -2315,8 +2314,10 @@ end: | |||
2315 | */ | 2314 | */ |
2316 | static int sony_pic_disable(struct acpi_device *device) | 2315 | static int sony_pic_disable(struct acpi_device *device) |
2317 | { | 2316 | { |
2318 | if (ACPI_FAILURE(acpi_evaluate_object(device->handle, | 2317 | acpi_status ret = acpi_evaluate_object(device->handle, "_DIS", NULL, |
2319 | "_DIS", NULL, NULL))) | 2318 | NULL); |
2319 | |||
2320 | if (ACPI_FAILURE(ret) && ret != AE_NOT_FOUND) | ||
2320 | return -ENXIO; | 2321 | return -ENXIO; |
2321 | 2322 | ||
2322 | dprintk("Device disabled\n"); | 2323 | dprintk("Device disabled\n"); |