Skip to content

Commit

Permalink
sunhme: Allow usage on SBI based SBus systems
Browse files Browse the repository at this point in the history
To prevent the SBus driver for Sun Happy Meal cards from being loaded for
PCI cards utilizing the same chipset, a filter was added to the probe
function in commit 0b492fc.

The filter was implemented by checking the name of the parent node in
the OF tree. This patch extends this filter, so that the driver will
load on SBus systems that are based upon SBI SBus Bridges.

Signed-off-by: Kjetil Oftedal <oftedal@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
oftedal authored and David S. Miller committed Nov 8, 2011
1 parent e50e705 commit 59caa56
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/sun/sunhme.c
Original file line number Diff line number Diff line change
Expand Up @@ -2637,7 +2637,7 @@ static int __devinit happy_meal_sbus_probe_one(struct platform_device *op, int i
sbus_dp = op->dev.parent->of_node;

/* We can match PCI devices too, do not accept those here. */
if (strcmp(sbus_dp->name, "sbus"))
if (strcmp(sbus_dp->name, "sbus") && strcmp(sbus_dp->name, "sbi"))
return err;

if (is_qfe) {
Expand Down

0 comments on commit 59caa56

Please sign in to comment.