Dan Carpenter cbdb97773e cavium/liquidio: fix some error handling in lio_set_phys_id() ...

There was a missing assignment so the "if (ret)" on the next line is
never true.

Fixes: f21fb3ed36 ('Add support of Cavium Liquidio ethernet adapters')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2015-06-25 02:13:03 -07:00

..

accessibility

…

acpi

Merge tag 'pm+acpi-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-06-23 14:18:07 -07:00

amba

…

android

…

ata

…

atm

atm: idt77105: Use setup_timer

2015-06-10 22:46:34 -07:00

auxdisplay

…

base

Merge tag 'regmap-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

2015-06-23 17:25:32 -07:00

bcma

…

block

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2015-06-24 16:49:49 -07:00

bluetooth

Bluetooth: ath3k: Add support of 04ca:300d AR3012 device

2015-06-18 21:00:06 +03:00

bus

Merge tag 'pm+acpi-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-06-23 14:18:07 -07:00

cdrom

…

char

Merge tag 'powerpc-4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

2015-06-24 08:46:32 -07:00

clk

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2015-06-24 16:49:49 -07:00

clocksource

clocksource: Increase dependencies of timer-stm32 to limit build wreckage

2015-06-21 20:01:48 +02:00

connector

…

cpufreq

Merge tag 'pm+acpi-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-06-23 14:18:07 -07:00

cpuidle

Merge branch 'pm-cpuidle'

2015-06-22 15:15:36 +02:00

crypto

Merge tag 'pm+acpi-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-06-23 14:18:07 -07:00

dca

…

devfreq

…

dio

…

dma

Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-06-22 17:59:09 -07:00

dma-buf

…

edac

EDAC, mce_amd_inj: Set MISCV on injection

2015-06-24 18:17:38 +02:00

eisa

…

extcon

…

firewire

…

firmware

Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-06-22 17:10:44 -07:00

fmc

…

gpio

Merge tag 'pinctrl-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

2015-06-24 19:21:02 -07:00

gpu

Merge tag 'pm+acpi-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-06-23 14:18:07 -07:00

hid

Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus

2015-06-22 16:23:43 +02:00

hsi

HSI: nokia-modem: use flags argument of devm_gpiod_get to set direction

2015-06-23 02:40:03 +02:00

hv

…

hwmon

Merge tag 'hwmon-for-linus-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

2015-06-23 13:39:56 -07:00

hwspinlock

…

hwtracing/coresight

…

i2c

Merge tag 'mfd-for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

2015-06-23 17:31:27 -07:00

ide

…

idle

…

iio

…

infiniband

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2015-06-24 16:49:49 -07:00

input

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2015-06-24 19:56:58 -07:00

iommu

Merge tag 'iommu-updates-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

2015-06-23 18:27:19 -07:00

ipack

…

irqchip

Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-06-22 19:42:56 -07:00

isdn

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2015-06-24 16:49:49 -07:00

leds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2015-06-24 19:56:58 -07:00

lguest

Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-06-22 17:59:09 -07:00

macintosh

macintosh/nvram: Remove as unused

2015-06-15 16:42:37 +10:00

mailbox

…

mcb

…

md

md: make sure MD_RECOVERY_DONE is clear before starting recovery/resync

2015-06-12 20:16:33 +10:00

media

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2015-06-23 14:08:54 -07:00

memory

…

memstick

…

message

fusion: remove dead MTRR code

2015-06-13 08:44:14 -07:00

mfd

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2015-06-24 16:49:49 -07:00

misc

cxl: Fix typo in debug print

2015-06-19 17:10:30 +10:00

mmc

mmc: queue: prevent soft lockups on PREEMPT=n

2015-06-18 09:21:04 +02:00

mtd

Merge tag 'powerpc-4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

2015-06-24 08:46:32 -07:00

net

cavium/liquidio: fix some error handling in lio_set_phys_id()

2015-06-25 02:13:03 -07:00

nfc

NFC: nfcmrvl: set PB_BAIL_OUT at setup

2015-06-13 00:08:55 +02:00

ntb

Merge tag 'pci-v4.2-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2015-06-23 13:41:24 -07:00

nubus

…

of

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2015-06-24 16:49:49 -07:00

oprofile

…

parisc

…

parport

…

pci

Merge tag 'pm+acpi-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-06-23 14:18:07 -07:00

pcmcia

pcmcia: do not break rsrc_nonstatic when handling anonymous cards

2015-06-16 07:29:39 +02:00

phy

…

pinctrl

Merge tag 'pinctrl-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

2015-06-24 19:21:02 -07:00

platform

Merge tag 'mfd-for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

2015-06-23 17:31:27 -07:00

pnp

Merge branches 'pnp' and 'pm-tools'

2015-06-19 01:18:43 +02:00

power

Merge tag 'for-4.2' of git://git.infradead.org/battery-2.6

2015-06-23 16:10:27 -07:00

powercap

…

pps

…

ps3

…

ptp

…

pwm

Merge tag 'pwm/for-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

2015-06-23 13:32:38 -07:00

rapidio

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2015-06-23 14:08:54 -07:00

ras

…

regulator

Merge tag 'mfd-for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

2015-06-23 17:31:27 -07:00

remoteproc

…

reset

…

rpmsg

…

rtc

Merge tag 'mfd-for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

2015-06-23 17:31:27 -07:00

s390

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2015-06-24 16:49:49 -07:00

sbus

…

scsi

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2015-06-24 16:49:49 -07:00

sfi

…

sh

…

sn

…

soc

…

spi

Merge remote-tracking branches 'spi/topic/sirf', 'spi/topic/spidev' and 'spi/topic/zynq' into spi-next

2015-06-18 00:19:56 +01:00

spmi

…

ssb

…

staging

Merge branch 'akpm' (patches from Andrew)

2015-06-24 20:47:21 -07:00

target

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2015-06-24 16:49:49 -07:00

tc

…

thermal

…

thunderbolt

…

tty

Merge branch 'akpm' (patches from Andrew)

2015-06-24 20:47:21 -07:00

uio

…

usb

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2015-06-23 15:55:44 -07:00

uwb

…

vfio

Merge tag 'powerpc-4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

2015-06-24 08:46:32 -07:00

vhost

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2015-06-24 16:49:49 -07:00

video

Merge tag 'backlight-for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight

2015-06-24 18:57:00 -07:00

virt

…

virtio

Merge tag 'pci-v4.2-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2015-06-23 13:41:24 -07:00

vlynq

…

vme

…

w1

…

watchdog

…

xen

frontswap: allow multiple backends

2015-06-24 17:49:45 -07:00

zorro

…

Kconfig

…

Makefile

…