aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/s390/pci/pci_debug.c6
-rw-r--r--drivers/s390/cio/blacklist.c12
2 files changed, 11 insertions, 7 deletions
diff --git a/arch/s390/pci/pci_debug.c b/arch/s390/pci/pci_debug.c
index 3229a2e570df..c22d4402ae45 100644
--- a/arch/s390/pci/pci_debug.c
+++ b/arch/s390/pci/pci_debug.c
@@ -45,8 +45,10 @@ static int pci_perf_show(struct seq_file *m, void *v)
45 45
46 if (!zdev) 46 if (!zdev)
47 return 0; 47 return 0;
48 if (!zdev->fmb) 48 if (!zdev->fmb) {
49 return seq_printf(m, "FMB statistics disabled\n"); 49 seq_puts(m, "FMB statistics disabled\n");
50 return 0;
51 }
50 52
51 /* header */ 53 /* header */
52 seq_printf(m, "FMB @ %p\n", zdev->fmb); 54 seq_printf(m, "FMB @ %p\n", zdev->fmb);
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index b3f791b2c1f8..20314aad7ab7 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -330,18 +330,20 @@ cio_ignore_proc_seq_show(struct seq_file *s, void *it)
330 if (!iter->in_range) { 330 if (!iter->in_range) {
331 /* First device in range. */ 331 /* First device in range. */
332 if ((iter->devno == __MAX_SUBCHANNEL) || 332 if ((iter->devno == __MAX_SUBCHANNEL) ||
333 !is_blacklisted(iter->ssid, iter->devno + 1)) 333 !is_blacklisted(iter->ssid, iter->devno + 1)) {
334 /* Singular device. */ 334 /* Singular device. */
335 return seq_printf(s, "0.%x.%04x\n", 335 seq_printf(s, "0.%x.%04x\n", iter->ssid, iter->devno);
336 iter->ssid, iter->devno); 336 return 0;
337 }
337 iter->in_range = 1; 338 iter->in_range = 1;
338 return seq_printf(s, "0.%x.%04x-", iter->ssid, iter->devno); 339 seq_printf(s, "0.%x.%04x-", iter->ssid, iter->devno);
340 return 0;
339 } 341 }
340 if ((iter->devno == __MAX_SUBCHANNEL) || 342 if ((iter->devno == __MAX_SUBCHANNEL) ||
341 !is_blacklisted(iter->ssid, iter->devno + 1)) { 343 !is_blacklisted(iter->ssid, iter->devno + 1)) {
342 /* Last device in range. */ 344 /* Last device in range. */
343 iter->in_range = 0; 345 iter->in_range = 0;
344 return seq_printf(s, "0.%x.%04x\n", iter->ssid, iter->devno); 346 seq_printf(s, "0.%x.%04x\n", iter->ssid, iter->devno);
345 } 347 }
346 return 0; 348 return 0;
347} 349}