refresh

diff --git a/meta b/meta
index 3d902412907605c3346c6b133d840df06f966be0..22631e1f531b05036b2d03d074f570524663888c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 3f872a9f8601049923de56a1bf97b823307023c0
-Head: ca9cdc5d59938cc96550ed352834d3fd5ca41f90
+Previous: b0d757edb63c513f290597bd2d9f8e92540cc7f4
+Head: 9bb9b96d1873adb423467ead619edde40a0e653e
 Applied:
   lmc: b355854c79a1e446e87684a41663ad5aae258b73
-  lid: 3cf2f8199942cdcb9639efcb120af639dbe9515e
-  refresh-temp: ca9cdc5d59938cc96550ed352834d3fd5ca41f90
+  lid: 9bb9b96d1873adb423467ead619edde40a0e653e
 Unapplied:
 Hidden:

diff --git a/patches/lid b/patches/lid
index 3a6f764660c01189bf6ae1bd56c90787371bef4a..0c4e7ff8e2778c3dfa0bbd679c615da342412bbf 100644 (file)
--- a/patches/lid
+++ b/patches/lid
@@ -1,5 +1,5 @@
 Bottom: b2af32a606dc3c3e64f150250320dc7d52426926
-Top:    70266ac3fc8299998c668dc5b15ed7ad85d3fc51
+Top:    93dfcd4be8bc16c920d7e571b1264983a3927e6a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-13 10:35:40 -0800
 
@@ -14,7 +14,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index e0f0b94..b367b70 100644
+index e0f0b94..9f6a13b 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -268,8 +268,13 @@ acm_format_name(int level, char *name, size_t name_size,
@@ -53,11 +53,11 @@ index e0f0b94..b367b70 100644
        uint8_t status;
  
        acm_log(2, "\n");
-+      for (i = 0; i < MAX_EP_ADDR; i++) {
++      for (i = 0; i < MAX_EP_MC; i++) {
 +              if (dest->mgid == ep->mc_dest[i].mgid)
 +                      break;
 +      }
-+      if (i == MAX_EP_ADDR) {
++      if (i == MAX_EP_MC) {
 +              acm_log(0, "ERROR - cannot match mgid\n");
 +              return ACM_STATUS_EINVAL;
 +      }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5542e24..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,27 +0,0 @@
-Bottom: 70266ac3fc8299998c668dc5b15ed7ad85d3fc51
-Top:    93dfcd4be8bc16c920d7e571b1264983a3927e6a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-17 08:06:55 -0800
-
-Refresh of lid
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index b367b70..9f6a13b 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -740,11 +740,11 @@ acm_record_acm_route(struct acm_ep *ep, struct acm_dest *dest)
-       uint8_t status;
- 
-       acm_log(2, "\n");
--      for (i = 0; i < MAX_EP_ADDR; i++) {
-+      for (i = 0; i < MAX_EP_MC; i++) {
-               if (dest->mgid == ep->mc_dest[i].mgid)
-                       break;
-       }
--      if (i == MAX_EP_ADDR) {
-+      if (i == MAX_EP_MC) {
-               acm_log(0, "ERROR - cannot match mgid\n");
-               return ACM_STATUS_EINVAL;
-       }