From cd3dd3c82d6ab58a556362e717f2a197b6ab663e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 3 Nov 2010 23:28:45 +0100 Subject: [PATCH] --- yaml --- r: 224555 b: refs/heads/master c: ca4a0831917d6541b45f03542257fcb20dc9cf4a h: refs/heads/master i: 224553: 14e66602f6a07ba409cd29344aa23186521b3b87 224551: 6d16413e2a58dae2be5dc439deb2509f38d56069 v: v3 --- [refs] | 2 +- trunk/drivers/ssb/pci.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d5a310bed9ce..882a3b768381 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54435f9ec837cf0bb0ea02a2bb6362a6aaef5250 +refs/heads/master: ca4a0831917d6541b45f03542257fcb20dc9cf4a diff --git a/trunk/drivers/ssb/pci.c b/trunk/drivers/ssb/pci.c index 3226832df32d..b5343ac37ee5 100644 --- a/trunk/drivers/ssb/pci.c +++ b/trunk/drivers/ssb/pci.c @@ -619,7 +619,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus, struct ssb_sprom *sprom) { const struct ssb_sprom *fallback; - int err = -ENOMEM; + int err; u16 *buf; if (!ssb_is_sprom_available(bus)) { @@ -646,7 +646,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus, buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL); if (!buf) - goto out; + return -ENOMEM; bus->sprom_size = SSB_SPROMSIZE_WORDS_R123; sprom_do_read(bus, buf); err = sprom_check_crc(buf, bus->sprom_size); @@ -656,7 +656,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus, buf = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16), GFP_KERNEL); if (!buf) - goto out; + return -ENOMEM; bus->sprom_size = SSB_SPROMSIZE_WORDS_R4; sprom_do_read(bus, buf); err = sprom_check_crc(buf, bus->sprom_size); @@ -678,7 +678,6 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus, out_free: kfree(buf); -out: return err; }