diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 12:11:04 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 12:11:04 +1100 |
| commit | 43e6d973088cb3f30dbb6636c284b50c173b2593 (patch) | |
| tree | c6f42aa301d420a192a1d7d999e4ff83c162523c /drivers/i2c/busses/i2c-sh_mobile.c | |
| parent | 2c10580d7e4a8c73b02d5fca7f6a149672b353e1 (diff) | |
| parent | f30f84ccff5c049c88b47628bb211b6273c72834 (diff) | |
Merge branch 'quilt/i2c'
Diffstat (limited to 'drivers/i2c/busses/i2c-sh_mobile.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-sh_mobile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c index 6c3d60b939bf..1c01083b01b5 100644 --- a/drivers/i2c/busses/i2c-sh_mobile.c +++ b/drivers/i2c/busses/i2c-sh_mobile.c @@ -500,7 +500,7 @@ static int sh_mobile_i2c_hook_irqs(struct platform_device *dev, int hook) while ((res = platform_get_resource(dev, IORESOURCE_IRQ, k))) { for (n = res->start; hook && n <= res->end; n++) { if (request_irq(n, sh_mobile_i2c_isr, IRQF_DISABLED, - dev->dev.bus_id, dev)) + dev_name(&dev->dev), dev)) goto rollback; } k++; |