From 9b589403fa69209bdc8bfad8720f9eb007ccdcef Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Tue, 2 Mar 2010 14:52:33 -0800 Subject: [PATCH] --- yaml --- r: 195315 b: refs/heads/master c: fa4dc36482a5236c92c589cdbc0a42ff5c945b6b h: refs/heads/master i: 195313: 67f58e63ec86a31e7330e2d96a6e39c7752da601 195311: 833a2022c3e95cf7365f69483ffadfef67e62b1c v: v3 --- [refs] | 2 +- trunk/drivers/usb/class/cdc-acm.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6de030e097a5..bde45b409251 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41f2c6e89cf4d412e4b20803f5feb2b9b1560476 +refs/heads/master: fa4dc36482a5236c92c589cdbc0a42ff5c945b6b diff --git a/trunk/drivers/usb/class/cdc-acm.h b/trunk/drivers/usb/class/cdc-acm.h index 4a8e87ec6ce9..5eeb570b9a61 100644 --- a/trunk/drivers/usb/class/cdc-acm.h +++ b/trunk/drivers/usb/class/cdc-acm.h @@ -124,8 +124,8 @@ struct acm { unsigned char clocal; /* termios CLOCAL */ unsigned int ctrl_caps; /* control capabilities from the class specific header */ unsigned int susp_count; /* number of suspended interfaces */ - int combined_interfaces:1; /* control and data collapsed */ - int is_int_ep:1; /* interrupt endpoints contrary to spec used */ + unsigned int combined_interfaces:1; /* control and data collapsed */ + unsigned int is_int_ep:1; /* interrupt endpoints contrary to spec used */ u8 bInterval; struct acm_wb *delayed_wb; /* write queued for a device about to be woken */ };