summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/pac7311.c
diff options
context:
space:
mode:
authorLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2008-12-05 15:27:43 +1100
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2008-12-05 15:27:43 +1100
commit14d676f56fad26fd3c31eeff5d4ef8ea4a163571 (patch)
tree5e740c5931daecf44a6e74c230f2deb291290f4b /drivers/media/video/gspca/pac7311.c
parent797eaed40e1df4a3b9ece6894a71ce2b568bca38 (diff)
parentfeaf3848a813a106f163013af6fcf6c4bfec92d9 (diff)
downloadtalos-obmc-linux-14d676f56fad26fd3c31eeff5d4ef8ea4a163571.tar.gz
talos-obmc-linux-14d676f56fad26fd3c31eeff5d4ef8ea4a163571.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/media/video/gspca/pac7311.c')
-rw-r--r--drivers/media/video/gspca/pac7311.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c
index e5ff9a6199ef..fbd45e235d97 100644
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
@@ -749,10 +749,13 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_6=LED */
}
+/* called on streamoff with alt 0 and on disconnect */
static void sd_stop0(struct gspca_dev *gspca_dev)
{
struct sd *sd = (struct sd *) gspca_dev;
+ if (!gspca_dev->present)
+ return;
if (sd->sensor == SENSOR_PAC7302) {
reg_w(gspca_dev, 0xff, 0x01);
reg_w(gspca_dev, 0x78, 0x40);
OpenPOWER on IntegriCloud