refresh

diff --git a/meta b/meta
index b7cac465408fc25f9a10c46cfbcaff685479fea7..b0c1e51d093143bbe2c819d01ca107f4ad24acd6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 4ff779a1a3349d25374b4cd7dda16a715e9684a2
-Head: 2df1b175f11618ca440a49cdaa4b07faee2cc0f5
+Previous: e18d065c60fe9ed2057a00c405485b4cec4cd8fd
+Head: 1fcfbc0bf78799aaf90fa585bd781233ee02767d
 Applied:
-  logging: f96cc780a72a9f0c0ae7ad11eceb44290dffd87d
-  refresh-temp: 2df1b175f11618ca440a49cdaa4b07faee2cc0f5
+  logging: 1fcfbc0bf78799aaf90fa585bd781233ee02767d
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/logging b/patches/logging
index 3a453af1099dff3a777111405071d8274252d794..944fb6410172711876b45d2d4a5e24ba6311838a 100644 (file)
--- a/patches/logging
+++ b/patches/logging
@@ -1,5 +1,5 @@
 Bottom: 30326a5093b7b177c8d7612eba401d4999793f71
-Top:    0646098666e1c28a204874a86b8c05cbaf79c80e
+Top:    fce4386974d7f89479b272a17777428be19699f0
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-11 16:51:45 -0800
 
@@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 820365c..c642060 100644
+index 820365c..6366491 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -37,6 +37,7 @@
@@ -75,7 +75,7 @@ index 820365c..c642060 100644
 +              acm_log_addr(2, "acm_get_dest: ", dest->addr_type, dest->address);
        } else {
                dest = NULL;
-+              acm_log_addr(2, "acm_get_dest: not found ", addr_type, address);
++              acm_log_addr(2, "acm_get_dest: not found ", addr_type, addr);
        }
 -      acm_log(2, "%p\n", dest);
        return dest;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f52d9b0..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 0646098666e1c28a204874a86b8c05cbaf79c80e
-Top:    fce4386974d7f89479b272a17777428be19699f0
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-15 09:11:00 -0800
-
-Refresh of logging
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index c642060..6366491 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -313,7 +313,7 @@ acm_get_dest(struct acm_ep *ep, uint8_t addr_type, uint8_t *addr)
-               acm_log_addr(2, "acm_get_dest: ", dest->addr_type, dest->address);
-       } else {
-               dest = NULL;
--              acm_log_addr(2, "acm_get_dest: not found ", addr_type, address);
-+              acm_log_addr(2, "acm_get_dest: not found ", addr_type, addr);
-       }
-       return dest;
- }