From 960e5d978f150d05d509369530e9cb09fb911cb7 Mon Sep 17 00:00:00 2001 From: Kevin Baradon Date: Mon, 22 Apr 2013 16:09:45 -0300 Subject: [PATCH] --- yaml --- r: 367085 b: refs/heads/master c: 7d54ba0e37130edda335e7f373f193014ede2a12 h: refs/heads/master i: 367083: 317007103c01d71cd13de4fae759a4bb8f428c02 v: v3 --- [refs] | 2 +- trunk/drivers/media/rc/imon.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 128274b77a5f..a7651592798c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7d141b312702d33449809b823894c486e6d9770 +refs/heads/master: 7d54ba0e37130edda335e7f373f193014ede2a12 diff --git a/trunk/drivers/media/rc/imon.c b/trunk/drivers/media/rc/imon.c index 624fd33d7086..3af7bb6c9f30 100644 --- a/trunk/drivers/media/rc/imon.c +++ b/trunk/drivers/media/rc/imon.c @@ -2324,7 +2324,14 @@ static int imon_probe(struct usb_interface *interface, } } else { - /* this is the secondary interface on the device */ + /* this is the secondary interface on the device */ + + /* fail early if first intf failed to register */ + if (!first_if_ctx) { + ret = -ENODEV; + goto fail; + } + ictx = imon_init_intf1(interface, first_if_ctx); if (!ictx) { pr_err("failed to attach to context!\n");