1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c
index fbfadbac67e8..100e7a5c5ea1 100644
--- a/drivers/ssb/pcmcia.c
+++ b/drivers/ssb/pcmcia.c
@@ -583,7 +583,7 @@ static int ssb_pcmcia_sprom_write_all(struct ssb_bus *bus, const u16 *sprom)
                         ssb_printk(".");
                 err = ssb_pcmcia_sprom_write(bus, i, sprom[i]);
                 if (err) {
-                        ssb_printk("\n" KERN_NOTICE PFX
+                        ssb_printk(KERN_NOTICE PFX
                                    "Failed to write to SPROM.\n");
                         failed = 1;
                         break;
@@ -591,7 +591,7 @@ static int ssb_pcmcia_sprom_write_all(struct ssb_bus *bus, const u16 *sprom)
         }
         err = ssb_pcmcia_sprom_command(bus, SSB_PCMCIA_SPROMCTL_WRITEDIS);
         if (err) {
-                ssb_printk("\n" KERN_NOTICE PFX
+                ssb_printk(KERN_NOTICE PFX
                            "Could not disable SPROM write access.\n");
                 failed = 1;
         }
@@ -678,7 +678,8 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
                         sprom->board_rev = tuple.TupleData[1];
                         break;
                 case SSB_PCMCIA_CIS_PA:
-                        GOTO_ERROR_ON(tuple.TupleDataLen != 9,
+                        GOTO_ERROR_ON((tuple.TupleDataLen != 9) &&
+                                      (tuple.TupleDataLen != 10),
                                       "pa tpl size");
                         sprom->pa0b0 = tuple.TupleData[1] |
                                  ((u16)tuple.TupleData[2] << 8);
@@ -718,7 +719,8 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
                         sprom->antenna_gain.ghz5.a3 = tuple.TupleData[1];
                         break;
                 case SSB_PCMCIA_CIS_BFLAGS:
-                        GOTO_ERROR_ON(tuple.TupleDataLen != 3,
+                        GOTO_ERROR_ON((tuple.TupleDataLen != 3) &&
+                                      (tuple.TupleDataLen != 5),
                                       "bfl tpl size");
                         sprom->boardflags_lo = tuple.TupleData[1] |
                                          ((u16)tuple.TupleData[2] << 8);