Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / solo6x10 / solo6010-core.c

diff --git a/drivers/staging/solo6x10/solo6010-core.c b/drivers/staging/solo6x10/solo6010-core.c
index 9dad749ca963014e0f304cee2bdb8edd4588a692..c433136f972ce8d5284c4fa5618f2e5ddd79f201 100644 (file)
--- a/drivers/staging/solo6x10/solo6010-core.c
+++ b/drivers/staging/solo6x10/solo6010-core.c
@@ -164,21 +164,21 @@ static int __devinit solo6010_pci_probe(struct pci_dev *pdev,
        chip_id = solo_reg_read(solo_dev, SOLO_CHIP_OPTION) &
                                        SOLO_CHIP_ID_MASK;
        switch (chip_id) {
-               case 7:
-                       solo_dev->nr_chans = 16;
-                       solo_dev->nr_ext = 5;
-                       break;
-               case 6:
-                       solo_dev->nr_chans = 8;
-                       solo_dev->nr_ext = 2;
-                       break;
-               default:
-                       dev_warn(&pdev->dev, "Invalid chip_id 0x%02x, "
-                                "defaulting to 4 channels\n",
-                                chip_id);
-               case 5:
-                       solo_dev->nr_chans = 4;
-                       solo_dev->nr_ext = 1;
+       case 7:
+               solo_dev->nr_chans = 16;
+               solo_dev->nr_ext = 5;
+               break;
+       case 6:
+               solo_dev->nr_chans = 8;
+               solo_dev->nr_ext = 2;
+               break;
+       default:
+               dev_warn(&pdev->dev, "Invalid chip_id 0x%02x, "
+                        "defaulting to 4 channels\n",
+                        chip_id);
+       case 5:
+               solo_dev->nr_chans = 4;
+               solo_dev->nr_ext = 1;
        }
 
        /* Disable all interrupts to start */