From 4809ddcc677b372f1c887d02e8a719ffb20d59b1 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 1 Sep 2011 02:57:02 -0300 Subject: [PATCH] --- yaml --- r: 271698 b: refs/heads/master c: f8dbab29f4d4b977a56776af0d5296b0e6386aef h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/tm6000/tm6000-core.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 701cbf7497c0..529d6560a5f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d657229ac4378700976fb2333c7433c5ea379d08 +refs/heads/master: f8dbab29f4d4b977a56776af0d5296b0e6386aef diff --git a/trunk/drivers/staging/tm6000/tm6000-core.c b/trunk/drivers/staging/tm6000/tm6000-core.c index 9cef1d11a01e..b3c4e0529f4f 100644 --- a/trunk/drivers/staging/tm6000/tm6000-core.c +++ b/trunk/drivers/staging/tm6000/tm6000-core.c @@ -621,6 +621,12 @@ int tm6000_reset(struct tm6000_core *dev) msleep(5); + /* + * Not all devices have int_in defined + */ + if (!dev->int_in.endp) + return 0; + err = usb_set_interface(dev->udev, dev->isoc_in.bInterfaceNumber, 2); if (err < 0) { tm6000_err("failed to select interface %d, alt. setting 2\n",