From ebc0e87abeedeeac39d522f0a26254015c273c79 Mon Sep 17 00:00:00 2001 From: Frank Schaefer Date: Sat, 22 Dec 2012 10:13:38 -0300 Subject: [PATCH] --- yaml --- r: 357121 b: refs/heads/master c: 2f5741aa6a71aea6bc8f186e8753f270ae8742f1 h: refs/heads/master i: 357119: 23e2d649f91f01abe529d95a4be4b59538873c05 v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/em28xx/em28xx-input.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1320912ed552..7949984057e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0dae88392395e228e67436cd08f084d395b39df5 +refs/heads/master: 2f5741aa6a71aea6bc8f186e8753f270ae8742f1 diff --git a/trunk/drivers/media/usb/em28xx/em28xx-input.c b/trunk/drivers/media/usb/em28xx/em28xx-input.c index 3899ea823336..3598221378ac 100644 --- a/trunk/drivers/media/usb/em28xx/em28xx-input.c +++ b/trunk/drivers/media/usb/em28xx/em28xx-input.c @@ -600,7 +600,7 @@ static int em28xx_ir_init(struct em28xx *dev) ir = kzalloc(sizeof(*ir), GFP_KERNEL); rc = rc_allocate_device(); if (!ir || !rc) - goto err_out_free; + goto error; /* record handles to ourself */ ir->dev = dev; @@ -629,14 +629,14 @@ static int em28xx_ir_init(struct em28xx *dev) break; default: err = -ENODEV; - goto err_out_free; + goto error; } /* By default, keep protocol field untouched */ rc_type = RC_BIT_UNKNOWN; err = em28xx_ir_change_protocol(rc, &rc_type); if (err) - goto err_out_free; + goto error; /* This is how often we ask the chip for IR information */ ir->polling = 100; /* ms */ @@ -661,7 +661,7 @@ static int em28xx_ir_init(struct em28xx *dev) /* all done */ err = rc_register_device(rc); if (err) - goto err_out_stop; + goto error; em28xx_register_i2c_ir(dev); @@ -674,9 +674,8 @@ static int em28xx_ir_init(struct em28xx *dev) return 0; -err_out_stop: +error: dev->ir = NULL; -err_out_free: rc_free_device(rc); kfree(ir); return err;