commit 2665c2995d6a6026cfc9ec118908dfccb74fb5e0
author Frank Schaefer <fschaefer.oss@googlemail.com> Thu Dec 27 19:02:43 2012 -0300
committer Mauro Carvalho Chehab <mchehab@redhat.com> Sat Jan 05 01:09:39 2013 -0200
tree ef731f712fc9c95dfdf869434c7ffd37abce892f
parent d3829fadc4611e96aa360b8ead5adefdf61f45ea

[media] em28xx: simplify device state tracking

DEV_INITIALIZED of enum em28xx_dev_state state is used nowhere and there is no
need for DEV_MISCONFIGURED, so remove this enum and use a boolean field
'disconnected' in the device struct instead.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

drivers/media/usb/em28xx/em28xx-dvb.c

diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index 01bb800..a81ec2e 100644
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -135,7 +135,7 @@
 	if (!dev)
 		return 0;
 
-	if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED))
+	if (dev->disconnected)
 		return 0;
 
 	if (urb->status < 0)
@@ -1322,7 +1322,7 @@
 	if (dev->dvb) {
 		struct em28xx_dvb *dvb = dev->dvb;
 
-		if (dev->state & DEV_DISCONNECTED) {
+		if (dev->disconnected) {
 			/* We cannot tell the device to sleep
 			 * once it has been unplugged. */
 			if (dvb->fe[0])