summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2012-04-03 22:58:08 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2012-04-03 22:58:08 +0200
commitb48f351a31cf5b3b676900f763baa4f122392fa3 (patch)
treed9f5f5e78871281720c7f0eee83ff82b247ca140
parentCheck for bad procfs creation. (diff)
downloadandroid-connect-blinker-master.tar.xz
android-connect-blinker-master.zip
Fix error handling.HEADmaster
-rw-r--r--blinker.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/blinker.c b/blinker.c
index 68df879..65db9bc 100644
--- a/blinker.c
+++ b/blinker.c
@@ -90,8 +90,10 @@ static int blink_entry(void *__buf, const char *name, int namelen, loff_t dir_of
snprintf(buf, MAX_LENGTH, "/sys/class/backlight/%s/brightness", name);
filp = filp_open(buf, O_RDWR, 0);
- if(IS_ERR(filp))
- goto error;
+ if(IS_ERR(filp)) {
+ printk(KERN_ERR "blinker: could not open %s\n", buf);
+ return 0;
+ }
offset = 0;
memset(buf, 0, MAX_LENGTH);
vfs_read(filp, buf, MAX_LENGTH - 1, &offset);
@@ -108,10 +110,6 @@ static int blink_entry(void *__buf, const char *name, int namelen, loff_t dir_of
vfs_write(filp, buf, MAX_LENGTH, &offset);
printk(KERN_INFO "blinker: restored backlight %s\n", name);
- goto out;
-error:
- printk(KERN_ERR "blinker: could not open %s\n", buf);
-out:
filp_close(filp, NULL);
return 0;
}