summaryrefslogtreecommitdiff
path: root/drivers/media/video/saa6588.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-12 23:30:15 +0300
committerJeff Garzik <jgarzik@pobox.com>2005-12-12 23:30:15 +0300
commit20234989a8ae0ff418e2acdef72205fb7cb3f819 (patch)
tree6888e6c6b8f2beef67b3f85570aebb853f8443f9 /drivers/media/video/saa6588.c
parent92f268e034faf793f6d40de2f0fc81478a14ff39 (diff)
parent49d7bc64283970ee83d2c954d04ba00d04e5943d (diff)
downloadlinux-20234989a8ae0ff418e2acdef72205fb7cb3f819.tar.xz
Merge branch 'master'
Diffstat (limited to 'drivers/media/video/saa6588.c')
-rw-r--r--drivers/media/video/saa6588.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index dca3ddfd510f..923322503e8f 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -422,7 +422,6 @@ static int saa6588_attach(struct i2c_adapter *adap, int addr, int kind)
s->timer.function = saa6588_timer;
s->timer.data = (unsigned long)s;
schedule_work(&s->work);
-
return 0;
}