diff --git a/CHANGES b/CHANGES
index 1eef11d2..9a14c12b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,7 @@ SVN HEAD
                    Get rid of a useless semaphore (2.6 backport)
   Programs i2cdetect, i2cdump, isadump: Flush output in real time
   Program sensors: Add smsc47m2 support (fans)
+                   Fix -A option (hide adapter name) on error
   Program sensors-detect: Only probe relevant I2C addresses
                           Drop ARP-capable device detection
                           Add Maxim MAX6655/MAX6656 detection
diff --git a/prog/sensors/main.c b/prog/sensors/main.c
index 20d92adb..7d1d1cc9 100644
--- a/prog/sensors/main.c
+++ b/prog/sensors/main.c
@@ -428,7 +428,6 @@ struct match matches[] = {
 
 void do_a_print(sensors_chip_name name)
 {
-  const char *adap;
   struct match *m;
 
   /* do we know how to display it? */
@@ -440,11 +439,13 @@ void do_a_print(sensors_chip_name name)
     return;
 
   printf("%s\n",sprintf_chip_name(name));
-  adap = sensors_get_adapter_name(name.bus);
-  if (adap && !hide_adapter)
-    printf("Adapter: %s\n",adap);
-  if (!adap)
-    fprintf(stderr, "Can't get adapter name for bus %d\n", name.bus);
+  if (!hide_adapter) {
+    const char *adap = sensors_get_adapter_name(name.bus);
+    if (adap)
+      printf("Adapter: %s\n", adap);
+    else
+      fprintf(stderr, "Can't get adapter name for bus %d\n", name.bus);
+  }
   if (do_unknown)
     print_unknown_chip(&name);
   else {