mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 00:39:48 +00:00
Code Issues Releases Wiki Activity

[media] zc3xx: remove dead code and uneeded gotos

Browse source 
As reported by smatch:
	drivers/media/usb/gspca/zc3xx.c:5994 transfer_update() info: ignoring unreachable code.

That happens because there's a return that it is never called,
as the work queue runs an infinite loop, except when the device is
put to sleep or an error happens.

When an error happens, a break statement is enough to go out of
the loop. So, let's remove the goto, as break is the typical
instruction used to end a loop.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2015-04-28 19:49:07 -03:00
parent b036f1cb6e
commit 094af36a3a
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/media/usb/gspca/zc3xx.c
View file

@ -5942,23 +5942,23 @@ static void transfer_update(struct work_struct *work)
reg07 = 0; reg07 = 0;
good = 0; good = 0;
for (;;) { while (1) {
msleep(100); msleep(100);
/* To protect gspca_dev->usb_buf and gspca_dev->usb_err */ /* To protect gspca_dev->usb_buf and gspca_dev->usb_err */
mutex_lock(&gspca_dev->usb_lock); mutex_lock(&gspca_dev->usb_lock);
#ifdef CONFIG_PM #ifdef CONFIG_PM
if (gspca_dev->frozen) if (gspca_dev->frozen)
goto err; break;
#endif #endif
if (!gspca_dev->present || !gspca_dev->streaming) if (!gspca_dev->present || !gspca_dev->streaming)
goto err; break;
/* Bit 0 of register 11 indicates FIFO overflow */ /* Bit 0 of register 11 indicates FIFO overflow */
gspca_dev->usb_err = 0; gspca_dev->usb_err = 0;
reg11 = reg_r(gspca_dev, 0x0011); reg11 = reg_r(gspca_dev, 0x0011);
if (gspca_dev->usb_err) if (gspca_dev->usb_err)
goto err; break;
change = reg11 & 0x01; change = reg11 & 0x01;
if (change) { /* overflow */ if (change) { /* overflow */
@ -5987,12 +5987,12 @@ static void transfer_update(struct work_struct *work)
gspca_dev->usb_err = 0; gspca_dev->usb_err = 0;
reg_w(gspca_dev, reg07, 0x0007); reg_w(gspca_dev, reg07, 0x0007);
if (gspca_dev->usb_err) if (gspca_dev->usb_err)
goto err; break;
} }
mutex_unlock(&gspca_dev->usb_lock); mutex_unlock(&gspca_dev->usb_lock);
} }
return;
err: /* Something went wrong. Unlock and return */
mutex_unlock(&gspca_dev->usb_lock); mutex_unlock(&gspca_dev->usb_lock);
} }