diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2009-04-21 14:05:44 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 18:20:55 -0300 |
commit | 8dd07ef1236356222207058ee6a83c24cc896e8d (patch) | |
tree | 0d9ac9ec019bbf6cccbe1caf14821170abb254e4 /drivers/media/video/gspca | |
parent | 30d35e49509345a3bee778e0cee8545cd70853e2 (diff) | |
download | kernel-crypto-8dd07ef1236356222207058ee6a83c24cc896e8d.tar.gz kernel-crypto-8dd07ef1236356222207058ee6a83c24cc896e8d.tar.xz kernel-crypto-8dd07ef1236356222207058ee6a83c24cc896e8d.zip |
V4L/DVB (11712): gspca - main: Set the current alternate setting only when needed
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca')
-rw-r--r-- | drivers/media/video/gspca/gspca.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index efa4dd349f6..ebeae6bdacc 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c @@ -486,7 +486,7 @@ static struct usb_host_endpoint *get_ep(struct gspca_dev *gspca_dev) } PDEBUG(D_STREAM, "use alt %d ep 0x%02x", i, ep->desc.bEndpointAddress); - if (i > 0) { + if (gspca_dev->nbalt > 1) { ret = usb_set_interface(gspca_dev->dev, gspca_dev->iface, i); if (ret < 0) { err("set alt %d err %d", i, ret); @@ -653,6 +653,8 @@ static int gspca_set_alt0(struct gspca_dev *gspca_dev) { int ret; + if (gspca_dev->alt == 0) + return 0; ret = usb_set_interface(gspca_dev->dev, gspca_dev->iface, 0); if (ret < 0) PDEBUG(D_ERR|D_STREAM, "set alt 0 err %d", ret); |