diff --git a/[refs] b/[refs] index aa2a9196749b..1e075c37b0f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5063557ac0e83a52182fd0d49e83cc770e52ccd1 +refs/heads/master: 5f07809e93b4c05516d85a3f2770b1a77115eb70 diff --git a/trunk/arch/arm/mach-rpc/ecard.c b/trunk/arch/arm/mach-rpc/ecard.c index b91bc87b3dcf..fcb1d59f7aec 100644 --- a/trunk/arch/arm/mach-rpc/ecard.c +++ b/trunk/arch/arm/mach-rpc/ecard.c @@ -960,7 +960,9 @@ static int __init ecard_probe(int slot, unsigned irq, card_type_t type) *ecp = ec; slot_to_expcard[slot] = ec; - device_register(&ec->dev); + rc = device_register(&ec->dev); + if (rc) + goto nodev; return 0;