From ed652816f9ff07a44178623b10b6a1d8a0842c79 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 31 Dec 2010 05:05:56 -0300 Subject: [PATCH] --- yaml --- r: 232175 b: refs/heads/master c: ee3629914b2b115f00f4197e80b1e7cb12881059 h: refs/heads/master i: 232173: 95b75a867015ff79232023720c082ca91fb7171f 232171: af5c3ac7ded822dd3c0910b28d1f2fd36a21a413 232167: d2d3fad56f85fd4431ea497afa005a4c99dd0de7 232159: 102b97ca10db6264372ed917ecc4ca4b1ce7ef07 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/gspca.c | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 4c23e5d641b7..9c0621872c96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d642de2ed472df308f8ee49417e29030f69b2095 +refs/heads/master: ee3629914b2b115f00f4197e80b1e7cb12881059 diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c index adab34f91a68..244fb76eaead 100644 --- a/trunk/drivers/media/video/gspca/gspca.c +++ b/trunk/drivers/media/video/gspca/gspca.c @@ -2019,9 +2019,7 @@ static unsigned int dev_poll(struct file *file, poll_table *wait) poll_wait(file, &gspca_dev->wq, wait); /* if reqbufs is not done, the user would use read() */ - if (gspca_dev->nframes == 0) { - if (gspca_dev->memory != GSPCA_MEMORY_NO) - return POLLERR; /* not the 1st time */ + if (gspca_dev->memory == GSPCA_MEMORY_NO) { ret = read_alloc(gspca_dev, file); if (ret != 0) return POLLERR; @@ -2053,18 +2051,10 @@ static ssize_t dev_read(struct file *file, char __user *data, PDEBUG(D_FRAM, "read (%zd)", count); if (!gspca_dev->present) return -ENODEV; - switch (gspca_dev->memory) { - case GSPCA_MEMORY_NO: /* first time */ + if (gspca_dev->memory == GSPCA_MEMORY_NO) { /* first time ? */ ret = read_alloc(gspca_dev, file); if (ret != 0) return ret; - break; - case GSPCA_MEMORY_READ: - if (gspca_dev->capt_file == file) - break; - /* fall thru */ - default: - return -EINVAL; } /* get a frame */