diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-24 09:24:04 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-24 09:24:04 -0500 |
| commit | 11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e (patch) | |
| tree | b01421cb139b11065d776ed361a7a12b3a1aecc9 /drivers/i2c/busses/i2c-mv64xxx.c | |
| parent | 54da9a3968448681d0ddf193ec90f2480c5cba1c (diff) | |
| parent | 2cc432eed0491df66e14b578139bba2c75fb3f9a (diff) | |
| download | talos-obmc-linux-11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e.tar.gz talos-obmc-linux-11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e.zip | |
Merge branch 'upstream'
Conflicts:
drivers/scsi/sata_vsc.c
Diffstat (limited to 'drivers/i2c/busses/i2c-mv64xxx.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-mv64xxx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index 22781d84f79f..ac5cde1bbd2b 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c @@ -516,6 +516,10 @@ mv64xxx_i2c_probe(struct platform_device *pd) drv_data->freq_m = pdata->freq_m; drv_data->freq_n = pdata->freq_n; drv_data->irq = platform_get_irq(pd, 0); + if (drv_data->irq < 0) { + rc = -ENXIO; + goto exit_unmap_regs; + } drv_data->adapter.id = I2C_HW_MV64XXX; drv_data->adapter.algo = &mv64xxx_i2c_algo; drv_data->adapter.owner = THIS_MODULE; |
